Merge tag 'powerpc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-eoan-kernel.git] / arch / powerpc / include / asm / mmu.h

diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 8d1499334257e12ef863b33df6faaf744362051c..a34c764ca8dd83435faf75307e30e5149e55de4b 100644 (file)
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -275,19 +275,20 @@ static inline bool early_radix_enabled(void)
 #define MMU_PAGE_64K   2
 #define MMU_PAGE_64K_AP        3       /* "Admixed pages" (hash64 only) */
 #define MMU_PAGE_256K  4
-#define MMU_PAGE_1M    5
-#define MMU_PAGE_2M    6
-#define MMU_PAGE_4M    7
-#define MMU_PAGE_8M    8
-#define MMU_PAGE_16M   9
-#define MMU_PAGE_64M   10
-#define MMU_PAGE_256M  11
-#define MMU_PAGE_1G    12
-#define MMU_PAGE_16G   13
-#define MMU_PAGE_64G   14
+#define MMU_PAGE_512K  5
+#define MMU_PAGE_1M    6
+#define MMU_PAGE_2M    7
+#define MMU_PAGE_4M    8
+#define MMU_PAGE_8M    9
+#define MMU_PAGE_16M   10
+#define MMU_PAGE_64M   11
+#define MMU_PAGE_256M  12
+#define MMU_PAGE_1G    13
+#define MMU_PAGE_16G   14
+#define MMU_PAGE_64G   15
 
 /* N.B. we need to change the type of hpte_page_sizes if this gets to be > 16 */
-#define MMU_PAGE_COUNT 15
+#define MMU_PAGE_COUNT 16
 
 #ifdef CONFIG_PPC_BOOK3S_64
 #include <asm/book3s/64/mmu.h>