From: LEROY Christophe <christophe.leroy@c-s.fr>
Date: Fri, 17 Apr 2015 16:37:17 +0000 (+0200)
Subject: powerpc/8xx: mmu_virtual_psize incorrect for 16k pages
X-Git-Tag: v4.2-rc1~135^2^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86c3b16e9f330c94062c40302ab266f0d932057e;p=platform%2Fkernel%2Flinux-exynos.git

powerpc/8xx: mmu_virtual_psize incorrect for 16k pages

mmu_virtual_psize shall be set to MMU_PAGE_16K when 16k pages have
been selected

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <scottwood@freescale.com>
---

diff --git a/arch/powerpc/include/asm/mmu-8xx.h b/arch/powerpc/include/asm/mmu-8xx.h
index 986b9e1..d41200c 100644
--- a/arch/powerpc/include/asm/mmu-8xx.h
+++ b/arch/powerpc/include/asm/mmu-8xx.h
@@ -145,7 +145,14 @@ typedef struct {
 } mm_context_t;
 #endif /* !__ASSEMBLY__ */
 
+#if (PAGE_SHIFT == 12)
 #define mmu_virtual_psize	MMU_PAGE_4K
+#elif (PAGE_SHIFT == 14)
+#define mmu_virtual_psize	MMU_PAGE_16K
+#else
+#error "Unsupported PAGE_SIZE"
+#endif
+
 #define mmu_linear_psize	MMU_PAGE_8M
 
 #endif /* _ASM_POWERPC_MMU_8XX_H_ */