Merge branch 'for-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index f7ee04a5ae27a2934de9fab746667597bffafef3..99250aee1ac166fd8d5bb03849041b2a07fc3f80 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -234,7 +234,7 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
                goto unlock;
 
        get_page(new);
-       pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
+       pte = pte_mkold(mk_pte(new, READ_ONCE(vma->vm_page_prot)));
        if (pte_swp_soft_dirty(*ptep))
                pte = pte_mksoft_dirty(pte);