powerpc/book3s: Use config independent helpers for page table walk

Even when we have HugeTLB and THP disabled, kernel linear map can still be
mapped with hugepages. This is only an issue with radix translation because hash
MMU doesn't map kernel linear range in linux page table and other kernel
map areas are not mapped using hugepage.

Add config independent helpers and put WARN_ON() when we don't expect things
to be mapped via hugepages.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c
index 646876d9da64..abe60d25b4e6 100644
--- a/arch/powerpc/mm/ptdump/ptdump.c
+++ b/arch/powerpc/mm/ptdump/ptdump.c
@@ -277,7 +277,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
 
         for (i = 0; i < PTRS_PER_PMD; i++, pmd++) {
                 addr = start + i * PMD_SIZE;
-                if (!pmd_none(*pmd) && !pmd_huge(*pmd))
+                if (!pmd_none(*pmd) && !pmd_is_leaf(*pmd))
                         /* pmd exists */
                         walk_pte(st, pmd, addr);
                 else
@@ -293,7 +293,7 @@ static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start)
 
         for (i = 0; i < PTRS_PER_PUD; i++, pud++) {
                 addr = start + i * PUD_SIZE;
-                if (!pud_none(*pud) && !pud_huge(*pud))
+                if (!pud_none(*pud) && !pud_is_leaf(*pud))
                         /* pud exists */
                         walk_pmd(st, pud, addr);
                 else
@@ -314,7 +314,7 @@ static void walk_pagetables(struct pg_state *st)
          * the hash pagetable.
          */
         for (i = 0; i < PTRS_PER_PGD; i++, pgd++, addr += PGDIR_SIZE) {
-                if (!pgd_none(*pgd) && !pgd_huge(*pgd))
+                if (!pgd_none(*pgd) && !pgd_is_leaf(*pgd))
                         /* pgd exists */
                         walk_pud(st, pgd, addr);
                 else