summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ozlabs.org>2011-04-12 19:00:05 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-04-20 16:59:20 +1000
commitee7a2aa3d3fd10a7157dd19f737b2bafdea0458f (patch)
tree2b562ba93b3c623d032c4808774366e357f21803
parent5e8e7b404ac965be45e25d5538676151de89aefb (diff)
downloadlinux-3.10-ee7a2aa3d3fd10a7157dd19f737b2bafdea0458f.tar.gz
linux-3.10-ee7a2aa3d3fd10a7157dd19f737b2bafdea0458f.tar.bz2
linux-3.10-ee7a2aa3d3fd10a7157dd19f737b2bafdea0458f.zip
powerpc/mm: Fix slice state initialization for Book3E
On Book3E, MMU_NO_CONTEXT != 0, but the slice_mm_new_context() macro assumes that it is. This means that the map of the page sizes for each slice is always initialized to zeroes (which happens to be 4k pages), rather than to the correct default base page size value - which might be 64k. This patch corrects the problem. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/include/asm/page_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
index 812b2cd80ae..488c52eb64c 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
@@ -130,7 +130,7 @@ extern void slice_set_user_psize(struct mm_struct *mm, unsigned int psize);
extern void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
unsigned long len, unsigned int psize);
-#define slice_mm_new_context(mm) ((mm)->context.id == 0)
+#define slice_mm_new_context(mm) ((mm)->context.id == MMU_NO_CONTEXT)
#endif /* __ASSEMBLY__ */
#else