Merge patch series "riscv: dma-mapping: unify support for cache flushes"

[platform/kernel/linux-rpi.git] / mm / debug_vm_pgtable.c

diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
index d61eaa0..48e329e 100644 (file)
--- a/mm/debug_vm_pgtable.c
+++ b/mm/debug_vm_pgtable.c
@@ -109,10 +109,10 @@ static void __init pte_basic_tests(struct pgtable_debug_args *args, int idx)
        WARN_ON(!pte_same(pte, pte));
        WARN_ON(!pte_young(pte_mkyoung(pte_mkold(pte))));
        WARN_ON(!pte_dirty(pte_mkdirty(pte_mkclean(pte))));
-       WARN_ON(!pte_write(pte_mkwrite(pte_wrprotect(pte))));
+       WARN_ON(!pte_write(pte_mkwrite(pte_wrprotect(pte), args->vma)));
        WARN_ON(pte_young(pte_mkold(pte_mkyoung(pte))));
        WARN_ON(pte_dirty(pte_mkclean(pte_mkdirty(pte))));
-       WARN_ON(pte_write(pte_wrprotect(pte_mkwrite(pte))));
+       WARN_ON(pte_write(pte_wrprotect(pte_mkwrite(pte, args->vma))));
        WARN_ON(pte_dirty(pte_wrprotect(pte_mkclean(pte))));
        WARN_ON(!pte_dirty(pte_wrprotect(pte_mkdirty(pte))));
 }
@@ -156,7 +156,7 @@ static void __init pte_advanced_tests(struct pgtable_debug_args *args)
        pte = pte_mkclean(pte);
        set_pte_at(args->mm, args->vaddr, args->ptep, pte);
        flush_dcache_page(page);
-       pte = pte_mkwrite(pte);
+       pte = pte_mkwrite(pte, args->vma);
        pte = pte_mkdirty(pte);
        ptep_set_access_flags(args->vma, args->vaddr, args->ptep, pte, 1);
        pte = ptep_get(args->ptep);
@@ -202,10 +202,10 @@ static void __init pmd_basic_tests(struct pgtable_debug_args *args, int idx)
        WARN_ON(!pmd_same(pmd, pmd));
        WARN_ON(!pmd_young(pmd_mkyoung(pmd_mkold(pmd))));
        WARN_ON(!pmd_dirty(pmd_mkdirty(pmd_mkclean(pmd))));
-       WARN_ON(!pmd_write(pmd_mkwrite(pmd_wrprotect(pmd))));
+       WARN_ON(!pmd_write(pmd_mkwrite(pmd_wrprotect(pmd), args->vma)));
        WARN_ON(pmd_young(pmd_mkold(pmd_mkyoung(pmd))));
        WARN_ON(pmd_dirty(pmd_mkclean(pmd_mkdirty(pmd))));
-       WARN_ON(pmd_write(pmd_wrprotect(pmd_mkwrite(pmd))));
+       WARN_ON(pmd_write(pmd_wrprotect(pmd_mkwrite(pmd, args->vma))));
        WARN_ON(pmd_dirty(pmd_wrprotect(pmd_mkclean(pmd))));
        WARN_ON(!pmd_dirty(pmd_wrprotect(pmd_mkdirty(pmd))));
        /*
@@ -256,7 +256,7 @@ static void __init pmd_advanced_tests(struct pgtable_debug_args *args)
        pmd = pmd_mkclean(pmd);
        set_pmd_at(args->mm, vaddr, args->pmdp, pmd);
        flush_dcache_page(page);
-       pmd = pmd_mkwrite(pmd);
+       pmd = pmd_mkwrite(pmd, args->vma);
        pmd = pmd_mkdirty(pmd);
        pmdp_set_access_flags(args->vma, vaddr, args->pmdp, pmd, 1);
        pmd = READ_ONCE(*args->pmdp);