From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 5 Dec 2018 00:13:56 +0000 (+1100)
Subject: mm-mmu_notifier-use-structure-for-invalidate_range_start-end-calls-fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c51c8ee29d2f4781bafbc816a99b137713dfc82;p=users%2Fwilly%2Flinux.git

mm-mmu_notifier-use-structure-for-invalidate_range_start-end-calls-fix

fix migrate_vma_collect(), per Jerome.

Cc: Christian König <christian.koenig@amd.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Felix Kuehling <felix.kuehling@amd.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krcmar <rkrcmar@redhat.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: Ross Zwisler <zwisler@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/mm/migrate.c b/mm/migrate.c
index c795ca3f92b9..83a21ce98bba 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2315,7 +2315,7 @@ static void migrate_vma_collect(struct migrate_vma *migrate)
 
 	range.start = migrate->start;
 	range.end = migrate->end;
-	range.mm = mm_walk.mm;
+	range.mm = migrate->vma->vm_mm;
 
 	mm_walk.pmd_entry = migrate_vma_collect_pmd;
 	mm_walk.pte_entry = NULL;