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

[linux-2.6-microblaze.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 47b8ccb..f1aa643 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1648,9 +1648,12 @@ EXPORT_SYMBOL(unpoison_memory);
 
 static struct page *new_page(struct page *p, unsigned long private)
 {
-       int nid = page_to_nid(p);
+       struct migration_target_control mtc = {
+               .nid = page_to_nid(p),
+               .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
+       };
 
-       return new_page_nodemask(p, nid, &node_states[N_MEMORY]);
+       return alloc_migration_target(p, (unsigned long)&mtc);
 }
 
 /*