2 files changed, 2 insertions, 13 deletions

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 3696b3bd1d7e..f6106d3f3dab 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1164,8 +1164,6 @@ void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
 
 /**
  * mm_walk - callbacks for walk_page_range
- * @pgd_entry: if set, called for each non-empty PGD (top-level) entry
- * @pud_entry: if set, called for each non-empty PUD (2nd-level) entry
  * @pmd_entry: if set, called for each non-empty PMD (3rd-level) entry
  *             this handler is required to be able to handle
  *             pmd_trans_huge() pmds.  They may simply choose to
@@ -1179,10 +1177,6 @@ void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
  * (see walk_page_range for more details)
  */
 struct mm_walk {
-        int (*pgd_entry)(pgd_t *pgd, unsigned long addr,
-                         unsigned long next, struct mm_walk *walk);
-        int (*pud_entry)(pud_t *pud, unsigned long addr,
-                         unsigned long next, struct mm_walk *walk);
         int (*pmd_entry)(pmd_t *pmd, unsigned long addr,
                          unsigned long next, struct mm_walk *walk);
         int (*pte_entry)(pte_t *pte, unsigned long addr,
diff --git a/mm/pagewalk.c b/mm/pagewalk.c
index b264bda46e1b..b793ef149da2 100644
--- a/mm/pagewalk.c
+++ b/mm/pagewalk.c
@@ -86,9 +86,7 @@ static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end,
                                 break;
                         continue;
                 }
-                if (walk->pud_entry)
-                        err = walk->pud_entry(pud, addr, next, walk);
-                if (!err && (walk->pmd_entry || walk->pte_entry))
+                if (walk->pmd_entry || walk->pte_entry)
                         err = walk_pmd_range(pud, addr, next, walk);
                 if (err)
                         break;
@@ -237,10 +235,7 @@ int walk_page_range(unsigned long addr, unsigned long end,
                         pgd++;
                         continue;
                 }
-                if (walk->pgd_entry)
-                        err = walk->pgd_entry(pgd, addr, next, walk);
-                if (!err &&
-                    (walk->pud_entry || walk->pmd_entry || walk->pte_entry))
+                if (walk->pmd_entry || walk->pte_entry)
                         err = walk_pud_range(pgd, addr, next, walk);
                 if (err)
                         break;