diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-05-22 02:25:51 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-22 06:20:57 -0400 |
commit | 5453e7723b95958f4591b2e0063573d8d53e7699 (patch) | |
tree | 3a12178ea3606270823b882d4f715dc33a9bea6b /arch | |
parent | 832a791c580a86cbeea5bb12a984d95b1f458539 (diff) |
[POWERPC] Fix warning in 32-bit builds with CONFIG_HIGHMEM
Some missing fixup for the removal of 4 level fixup header.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/mm/mem.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 246eeea40ece..0266a94d83b6 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -310,11 +310,12 @@ void __init paging_init(void) | |||
310 | 310 | ||
311 | #ifdef CONFIG_HIGHMEM | 311 | #ifdef CONFIG_HIGHMEM |
312 | map_page(PKMAP_BASE, 0, 0); /* XXX gross */ | 312 | map_page(PKMAP_BASE, 0, 0); /* XXX gross */ |
313 | pkmap_page_table = pte_offset_kernel(pmd_offset(pgd_offset_k | 313 | pkmap_page_table = pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k |
314 | (PKMAP_BASE), PKMAP_BASE), PKMAP_BASE); | 314 | (PKMAP_BASE), PKMAP_BASE), PKMAP_BASE), PKMAP_BASE); |
315 | map_page(KMAP_FIX_BEGIN, 0, 0); /* XXX gross */ | 315 | map_page(KMAP_FIX_BEGIN, 0, 0); /* XXX gross */ |
316 | kmap_pte = pte_offset_kernel(pmd_offset(pgd_offset_k | 316 | kmap_pte = pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k |
317 | (KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), KMAP_FIX_BEGIN); | 317 | (KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), |
318 | KMAP_FIX_BEGIN); | ||
318 | kmap_prot = PAGE_KERNEL; | 319 | kmap_prot = PAGE_KERNEL; |
319 | #endif /* CONFIG_HIGHMEM */ | 320 | #endif /* CONFIG_HIGHMEM */ |
320 | 321 | ||