powerpc/ptdump: drop dummy KERN_VIRT_START on PPC32
authorChristophe Leroy <christophe.leroy@c-s.fr>
Wed, 14 Aug 2019 12:36:11 +0000 (12:36 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 20 Aug 2019 11:22:09 +0000 (21:22 +1000)
PPC32 doesn't have KERN_VIRT_START. Make PAGE_OFFSET the
default starting address for the dump, and drop the dummy
definition of KERN_VIRT_START. Only use KERN_VIRT_START for
non radix PPC64.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/334632b1df4775b0ccf3bdc8d6b201d14e3daedd.1565786091.git.christophe.leroy@c-s.fr
arch/powerpc/mm/ptdump/ptdump.c

index 74ff2bff4ea01b9154aba21a003eb9cb7abb7ec3..9a2186c133e67550fe2b4d4af6bc37feeb603fc3 100644 (file)
 
 #include "ptdump.h"
 
-#ifdef CONFIG_PPC32
-#define KERN_VIRT_START        0
-#endif
-
 /*
  * To visualise what is happening,
  *
@@ -362,12 +358,13 @@ static int ptdump_show(struct seq_file *m, void *v)
        struct pg_state st = {
                .seq = m,
                .marker = address_markers,
+               .start_address = PAGE_OFFSET,
        };
 
-       if (radix_enabled())
-               st.start_address = PAGE_OFFSET;
-       else
+#ifdef CONFIG_PPC64
+       if (!radix_enabled())
                st.start_address = KERN_VIRT_START;
+#endif
 
        /* Traverse kernel page tables */
        walk_pagetables(&st);
@@ -405,12 +402,13 @@ void ptdump_check_wx(void)
                .seq = NULL,
                .marker = address_markers,
                .check_wx = true,
+               .start_address = PAGE_OFFSET,
        };
 
-       if (radix_enabled())
-               st.start_address = PAGE_OFFSET;
-       else
+#ifdef CONFIG_PPC64
+       if (!radix_enabled())
                st.start_address = KERN_VIRT_START;
+#endif
 
        walk_pagetables(&st);