diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /arch/powerpc/mm | |
| parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
| parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) | |
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, | |||
| 169 | #ifdef CONFIG_PPC_ISERIES | 169 | #ifdef CONFIG_PPC_ISERIES |
| 170 | if (_machine == PLATFORM_ISERIES_LPAR) | 170 | if (_machine == PLATFORM_ISERIES_LPAR) |
| 171 | ret = iSeries_hpte_insert(hpteg, va, | 171 | ret = iSeries_hpte_insert(hpteg, va, |
| 172 | virt_to_abs(paddr), | 172 | __pa(vaddr), |
| 173 | tmp_mode, | 173 | tmp_mode, |
| 174 | HPTE_V_BOLTED, | 174 | HPTE_V_BOLTED, |
| 175 | psize); | 175 | psize); |