Merge tag 'f2fs-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[linux-2.6-microblaze.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index bd0f409..6d3e2f0 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -125,6 +125,20 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
 
                                pages++;
                        }
+
+                       if (is_write_device_private_entry(entry)) {
+                               pte_t newpte;
+
+                               /*
+                                * We do not preserve soft-dirtiness. See
+                                * copy_one_pte() for explanation.
+                                */
+                               make_device_private_entry_read(&entry);
+                               newpte = swp_entry_to_pte(entry);
+                               set_pte_at(mm, addr, pte, newpte);
+
+                               pages++;
+                       }
                }
        } while (pte++, addr += PAGE_SIZE, addr != end);
        arch_leave_lazy_mmu_mode();
@@ -149,7 +163,7 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
                unsigned long this_pages;
 
                next = pmd_addr_end(addr, end);
-               if (!pmd_trans_huge(*pmd) && !pmd_devmap(*pmd)
+               if (!is_swap_pmd(*pmd) && !pmd_trans_huge(*pmd) && !pmd_devmap(*pmd)
                                && pmd_none_or_clear_bad(pmd))
                        continue;
 
@@ -159,7 +173,7 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
                        mmu_notifier_invalidate_range_start(mm, mni_start, end);
                }
 
-               if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
+               if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
                        if (next - addr != HPAGE_PMD_SIZE) {
                                __split_huge_pmd(vma, pmd, addr, false, NULL);
                        } else {