summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/hash_utils_64.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-01 01:58:38 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-01 01:58:38 -0500
commit68727fed5469100bec0764207d7efb7a9ecdee29 (patch)
tree7afb58ab7665b90122d3b4505be5c6c9f8bade4b /arch/powerpc/mm/hash_utils_64.c
parentdbfedbb98145375106cee7ec7269611d553819dc (diff)
parentb5b9d6647c1cd5eee90b58941c55f874c2a7e707 (diff)
downloadlinux-68727fed5469100bec0764207d7efb7a9ecdee29.tar.gz
linux-68727fed5469100bec0764207d7efb7a9ecdee29.tar.bz2
linux-68727fed5469100bec0764207d7efb7a9ecdee29.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
-rw-r--r--arch/powerpc/mm/hash_utils_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index b1f614c612dd..e9d589eefc14 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -169,7 +169,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
#ifdef CONFIG_PPC_ISERIES
if (_machine == PLATFORM_ISERIES_LPAR)
ret = iSeries_hpte_insert(hpteg, va,
- virt_to_abs(paddr),
+ __pa(vaddr),
tmp_mode,
HPTE_V_BOLTED,
psize);