1 files changed, 11 insertions, 12 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index c9c73a35aca7..9f4ed4e985c1 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2320,6 +2320,11 @@ next:
         return 0;
 }
 
+static const struct mm_walk_ops migrate_vma_walk_ops = {
+        .pmd_entry              = migrate_vma_collect_pmd,
+        .pte_hole               = migrate_vma_collect_hole,
+};
+
 /*
  * migrate_vma_collect() - collect pages over a range of virtual addresses
  * @migrate: migrate struct containing all migration information
@@ -2331,21 +2336,15 @@ next:
 static void migrate_vma_collect(struct migrate_vma *migrate)
 {
         struct mmu_notifier_range range;
-        struct mm_walk mm_walk = {
-                .pmd_entry = migrate_vma_collect_pmd,
-                .pte_hole = migrate_vma_collect_hole,
-                .vma = migrate->vma,
-                .mm = migrate->vma->vm_mm,
-                .private = migrate,
-        };
 
-        mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm_walk.mm,
-                                migrate->start,
-                                migrate->end);
+        mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL,
+                        migrate->vma->vm_mm, migrate->start, migrate->end);
         mmu_notifier_invalidate_range_start(&range);
-        walk_page_range(migrate->start, migrate->end, &mm_walk);
-        mmu_notifier_invalidate_range_end(&range);
 
+        walk_page_range(migrate->vma->vm_mm, migrate->start, migrate->end,
+                        &migrate_vma_walk_ops, migrate);
+
+        mmu_notifier_invalidate_range_end(&range);
         migrate->end = migrate->start + (migrate->npages << PAGE_SHIFT);
 }