diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 06:35:24 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 06:35:24 +0100 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /arch/powerpc/mm | |
| parent | powerpc: Export variables used in conversions to/from cputime_t (diff) | |
| parent | [PATCH] powerpc/iseries: Fix double phys_to_abs bug in htab_bolt_mapping (diff) | |
| download | linux-6749c5507388f3fc3719f57a54b540ee83f6661a.tar.xz linux-6749c5507388f3fc3719f57a54b540ee83f6661a.zip | |
Merge ../powerpc-merge
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 |
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 ae2c919cbecd..7d9ce9a48219 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); |