Commit 863c84b9 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

[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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c8e3c8b2
...@@ -605,6 +605,7 @@ config NODES_SPAN_OTHER_NODES ...@@ -605,6 +605,7 @@ config NODES_SPAN_OTHER_NODES
config PPC_64K_PAGES config PPC_64K_PAGES
bool "64k page size" bool "64k page size"
depends on PPC64
help help
This option changes the kernel logical page size to 64k. On machines This option changes the kernel logical page size to 64k. On machines
without processor support for 64k pages, the kernel will simulate without processor support for 64k pages, the kernel will simulate
......
...@@ -188,9 +188,9 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, ...@@ -188,9 +188,9 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
if (Hash == 0) if (Hash == 0)
return; return;
pmd = pmd_offset(pgd_offset(vma->vm_mm, address), address); pmd = pmd_offset(pgd_offset(mm, ea), ea);
if (!pmd_none(*pmd)) if (!pmd_none(*pmd))
add_hash_page(vma->vm_mm->context, address, pmd_val(*pmd)); add_hash_page(mm->context, ea, pmd_val(*pmd));
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment