2 files changed, 16 insertions, 8 deletions

diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c
index bbc5a29ecaaf..612965375473 100644
--- a/arch/arm64/mm/dump.c
+++ b/arch/arm64/mm/dump.c
@@ -249,10 +249,12 @@ 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_sect(*pmd) || pmd_bad(*pmd))
+                if (pmd_none(*pmd) || pmd_sect(*pmd)) {
                         note_page(st, addr, 3, pmd_val(*pmd));
-                else
+                } else {
+                        BUG_ON(pmd_bad(*pmd));
                         walk_pte(st, pmd, addr);
+                }
         }
 }
 
@@ -264,10 +266,12 @@ 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_sect(*pud) || pud_bad(*pud))
+                if (pud_none(*pud) || pud_sect(*pud)) {
                         note_page(st, addr, 2, pud_val(*pud));
-                else
+                } else {
+                        BUG_ON(pud_bad(*pud));
                         walk_pmd(st, pud, addr);
+                }
         }
 }
 
@@ -279,10 +283,12 @@ static void walk_pgd(struct pg_state *st, struct mm_struct *mm, unsigned long st
 
         for (i = 0; i < PTRS_PER_PGD; i++, pgd++) {
                 addr = start + i * PGDIR_SIZE;
-                if (pgd_none(*pgd) || pgd_bad(*pgd))
+                if (pgd_none(*pgd)) {
                         note_page(st, addr, 1, pgd_val(*pgd));
-                else
+                } else {
+                        BUG_ON(pgd_bad(*pgd));
                         walk_pud(st, pgd, addr);
+                }
         }
 }
 
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index a421f535d351..2eeac10aa0cf 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -90,13 +90,14 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr,
 {
         pte_t *pte;
 
-        if (pmd_none(*pmd) || pmd_bad(*pmd)) {
+        if (pmd_none(*pmd) || pmd_sect(*pmd)) {
                 pte = alloc(PTRS_PER_PTE * sizeof(pte_t));
                 if (pmd_sect(*pmd))
                         split_pmd(pmd, pte);
                 __pmd_populate(pmd, __pa(pte), PMD_TYPE_TABLE);
                 flush_tlb_all();
         }
+        BUG_ON(pmd_bad(*pmd));
 
         pte = pte_offset_kernel(pmd, addr);
         do {
@@ -128,7 +129,7 @@ static void alloc_init_pmd(struct mm_struct *mm, pud_t *pud,
         /*
          * Check for initial section mappings in the pgd/pud and remove them.
          */
-        if (pud_none(*pud) || pud_bad(*pud)) {
+        if (pud_none(*pud) || pud_sect(*pud)) {
                 pmd = alloc(PTRS_PER_PMD * sizeof(pmd_t));
                 if (pud_sect(*pud)) {
                         /*
@@ -140,6 +141,7 @@ static void alloc_init_pmd(struct mm_struct *mm, pud_t *pud,
                 pud_populate(mm, pud, pmd);
                 flush_tlb_all();
         }
+        BUG_ON(pud_bad(*pud));
 
         pmd = pmd_offset(pud, addr);
         do {