Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[thirdparty/kernel/stable.git] / mm / migrate_device.c

diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index b6c27c76e1a0b2768de8f4196144bd8e43197df6..66206734b1b9c9238a6c86238e591d1efc1f8661 100644 (file)
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -664,13 +664,9 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate,
        if (flush) {
                flush_cache_page(vma, addr, pte_pfn(orig_pte));
                ptep_clear_flush(vma, addr, ptep);
-               set_pte_at_notify(mm, addr, ptep, entry);
-               update_mmu_cache(vma, addr, ptep);
-       } else {
-               /* No need to invalidate - it was non-present before */
-               set_pte_at(mm, addr, ptep, entry);
-               update_mmu_cache(vma, addr, ptep);
        }
+       set_pte_at(mm, addr, ptep, entry);
+       update_mmu_cache(vma, addr, ptep);
 
        pte_unmap_unlock(ptep, ptl);
        *src = MIGRATE_PFN_MIGRATE;