diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-07 03:57:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:23 -0500 |
commit | 863c84b97cb660dbb949398e196c0b1bbe4ed39f (patch) | |
tree | 2942dd6318ec8d9dfb1a3dd9037c00c5700beeac /arch | |
parent | c8e3c8b21bd7a317d071ab8cf478880e7a4f92d6 (diff) |
[PATCH] ppc: Fix ppc32 build after 64K pages
Oops, some last minute changes caused the 64K pages patch to break ppc32
build, this fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/mm/ppc_mmu_32.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index ca7acb0c79f0..55ce49570524 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -605,6 +605,7 @@ config NODES_SPAN_OTHER_NODES | |||
605 | 605 | ||
606 | config PPC_64K_PAGES | 606 | config PPC_64K_PAGES |
607 | bool "64k page size" | 607 | bool "64k page size" |
608 | depends on PPC64 | ||
608 | help | 609 | help |
609 | This option changes the kernel logical page size to 64k. On machines | 610 | This option changes the kernel logical page size to 64k. On machines |
610 | without processor support for 64k pages, the kernel will simulate | 611 | without processor support for 64k pages, the kernel will simulate |
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c index d137abd241ff..ed7fcfe5fd37 100644 --- a/arch/powerpc/mm/ppc_mmu_32.c +++ b/arch/powerpc/mm/ppc_mmu_32.c | |||
@@ -188,9 +188,9 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, | |||
188 | 188 | ||
189 | if (Hash == 0) | 189 | if (Hash == 0) |
190 | return; | 190 | return; |
191 | pmd = pmd_offset(pgd_offset(vma->vm_mm, address), address); | 191 | pmd = pmd_offset(pgd_offset(mm, ea), ea); |
192 | if (!pmd_none(*pmd)) | 192 | if (!pmd_none(*pmd)) |
193 | add_hash_page(vma->vm_mm->context, address, pmd_val(*pmd)); | 193 | add_hash_page(mm->context, ea, pmd_val(*pmd)); |
194 | } | 194 | } |
195 | 195 | ||
196 | /* | 196 | /* |