The core code already has a check for pXd_none(), so remove it from the
architecture implementation.

Cc: Chintan Pandya <cpan...@codeaurora.org>
Cc: Toshi Kani <toshi.k...@hpe.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Michal Hocko <mho...@suse.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Will Deacon <will.dea...@arm.com>
---
 arch/arm64/mm/mmu.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index d1d6601b385d..786cfa6355be 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -989,10 +989,8 @@ int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr)
 
        pmd = READ_ONCE(*pmdp);
 
-       if (!pmd_present(pmd))
-               return 1;
        if (!pmd_table(pmd)) {
-               VM_WARN_ON(!pmd_table(pmd));
+               VM_WARN_ON(1);
                return 1;
        }
 
@@ -1012,10 +1010,8 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr)
 
        pud = READ_ONCE(*pudp);
 
-       if (!pud_present(pud))
-               return 1;
        if (!pud_table(pud)) {
-               VM_WARN_ON(!pud_table(pud));
+               VM_WARN_ON(1);
                return 1;
        }
 
-- 
2.1.4

Reply via email to