2 files changed, 3 insertions, 7 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 3d2783e10596..7de1bf85f683 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1377,13 +1377,6 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         }
 
         /*
-         * The page_table_lock above provides a memory barrier
-         * with change_protection_range.
-         */
-        if (mm_tlb_flush_pending(mm))
-                flush_tlb_range(vma, haddr, haddr + HPAGE_PMD_SIZE);
-
-        /*
          * Migrate the THP to the requested node, returns with page unlocked
          * and pmd_numa cleared.
          */
diff --git a/mm/migrate.c b/mm/migrate.c
index cfb419085261..e9b710201335 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1759,6 +1759,9 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
                 goto out_fail;
         }
 
+        if (mm_tlb_flush_pending(mm))
+                flush_tlb_range(vma, mmun_start, mmun_end);
+
         /* Prepare a page as a migration target */
         __set_page_locked(new_page);
         SetPageSwapBacked(new_page);