arm64: mte: Add asynchronous mode support

[linux-2.6-microblaze.git] / mm / pgtable-generic.c

diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c
index 9578db8..c2210e1 100644 (file)
--- a/mm/pgtable-generic.c
+++ b/mm/pgtable-generic.c
@@ -135,8 +135,9 @@ pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma, unsigned long address,
 {
        pmd_t pmd;
        VM_BUG_ON(address & ~HPAGE_PMD_MASK);
-       VM_BUG_ON((pmd_present(*pmdp) && !pmd_trans_huge(*pmdp) &&
-                          !pmd_devmap(*pmdp)) || !pmd_present(*pmdp));
+       VM_BUG_ON(!pmd_present(*pmdp));
+       /* Below assumes pmd_present() is true */
+       VM_BUG_ON(!pmd_trans_huge(*pmdp) && !pmd_devmap(*pmdp));
        pmd = pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp);
        flush_pmd_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
        return pmd;