Merge tag 'metag-fixes-v4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhoga...

[firefly-linux-kernel-4.4.55.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 5e8f03a8de2ab2ef2a2671875e4b665cc6437c3b..85e04268603143826e8cd80c533419feb221ad56 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1847,7 +1847,7 @@ out_fail:
 out_dropref:
        ptl = pmd_lock(mm, pmd);
        if (pmd_same(*pmd, entry)) {
-               entry = pmd_mknonnuma(entry);
+               entry = pmd_modify(entry, vma->vm_page_prot);
                set_pmd_at(mm, mmun_start, pmd, entry);
                update_mmu_cache_pmd(vma, address, &entry);
        }