1 files changed, 14 insertions, 18 deletions

diff --git a/arch/powerpc/mm/dump_linuxpagetables.c b/arch/powerpc/mm/dump_linuxpagetables.c
index c2e7dea59490..876e2a3c79f2 100644
--- a/arch/powerpc/mm/dump_linuxpagetables.c
+++ b/arch/powerpc/mm/dump_linuxpagetables.c
@@ -112,26 +112,25 @@ struct flag_info {
 
 static const struct flag_info flag_array[] = {
         {
-#ifdef CONFIG_PPC_BOOK3S_64
-                .mask   = _PAGE_PRIVILEGED,
-                .val    = 0,
-#else
-                .mask   = _PAGE_USER,
+                .mask   = _PAGE_USER | _PAGE_PRIVILEGED,
                 .val    = _PAGE_USER,
-#endif
                 .set    = "user",
                 .clear  = "    ",
         }, {
-#if _PAGE_RO == 0
-                .mask   = _PAGE_RW,
+                .mask   = _PAGE_RW | _PAGE_RO | _PAGE_NA,
                 .val    = _PAGE_RW,
-#else
-                .mask   = _PAGE_RO,
-                .val    = 0,
-#endif
                 .set    = "rw",
-                .clear  = "ro",
         }, {
+                .mask   = _PAGE_RW | _PAGE_RO | _PAGE_NA,
+                .val    = _PAGE_RO,
+                .set    = "ro",
+        }, {
+#if _PAGE_NA != 0
+                .mask   = _PAGE_RW | _PAGE_RO | _PAGE_NA,
+                .val    = _PAGE_RO,
+                .set    = "na",
+        }, {
+#endif
                 .mask   = _PAGE_EXEC,
                 .val    = _PAGE_EXEC,
                 .set    = " X ",
@@ -213,7 +212,7 @@ static const struct flag_info flag_array[] = {
                 .val    = H_PAGE_4K_PFN,
                 .set    = "4K_pfn",
         }, {
-#endif
+#else /* CONFIG_PPC_64K_PAGES */
                 .mask   = H_PAGE_F_GIX,
                 .val    = H_PAGE_F_GIX,
                 .set    = "f_gix",
@@ -224,14 +223,11 @@ static const struct flag_info flag_array[] = {
                 .val    = H_PAGE_F_SECOND,
                 .set    = "f_second",
         }, {
+#endif /* CONFIG_PPC_64K_PAGES */
 #endif
                 .mask   = _PAGE_SPECIAL,
                 .val    = _PAGE_SPECIAL,
                 .set    = "special",
-        }, {
-                .mask   = _PAGE_SHARED,
-                .val    = _PAGE_SHARED,
-                .set    = "shared",
         }
 };