Merge tag 's390-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[platform/kernel/linux-rpi.git] / arch / s390 / mm / pageattr.c

diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index 43c919c..b87e96c 100644 (file)
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -98,7 +98,7 @@ static int walk_pte_level(pmd_t *pmdp, unsigned long addr, unsigned long end,
                if (flags & SET_MEMORY_RO)
                        new = pte_wrprotect(new);
                else if (flags & SET_MEMORY_RW)
-                       new = pte_mkwrite(pte_mkdirty(new));
+                       new = pte_mkwrite_novma(pte_mkdirty(new));
                if (flags & SET_MEMORY_NX)
                        new = set_pte_bit(new, __pgprot(_PAGE_NOEXEC));
                else if (flags & SET_MEMORY_X)
@@ -156,7 +156,7 @@ static void modify_pmd_page(pmd_t *pmdp, unsigned long addr,
        if (flags & SET_MEMORY_RO)
                new = pmd_wrprotect(new);
        else if (flags & SET_MEMORY_RW)
-               new = pmd_mkwrite(pmd_mkdirty(new));
+               new = pmd_mkwrite_novma(pmd_mkdirty(new));
        if (flags & SET_MEMORY_NX)
                new = set_pmd_bit(new, __pgprot(_SEGMENT_ENTRY_NOEXEC));
        else if (flags & SET_MEMORY_X)