Merge branch 'parisc-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 6f20357..b44d4c7 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1290,27 +1290,6 @@ found:
        return 0;
 }
 
-static struct page *new_node_page(struct page *page, unsigned long private)
-{
-       nodemask_t nmask = node_states[N_MEMORY];
-       struct migration_target_control mtc = {
-               .nid = page_to_nid(page),
-               .nmask = &nmask,
-               .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
-       };
-
-       /*
-        * try to allocate from a different node but reuse this node if there
-        * are no other online nodes to be used (e.g. we are offlining a part
-        * of the only existing node)
-        */
-       node_clear(mtc.nid, nmask);
-       if (nodes_empty(nmask))
-               node_set(mtc.nid, nmask);
-
-       return alloc_migration_target(page, (unsigned long)&mtc);
-}
-
 static int
 do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 {
@@ -1370,9 +1349,28 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                put_page(page);
        }
        if (!list_empty(&source)) {
-               /* Allocate a new page from the nearest neighbor node */
-               ret = migrate_pages(&source, new_node_page, NULL, 0,
-                                       MIGRATE_SYNC, MR_MEMORY_HOTPLUG);
+               nodemask_t nmask = node_states[N_MEMORY];
+               struct migration_target_control mtc = {
+                       .nmask = &nmask,
+                       .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
+               };
+
+               /*
+                * We have checked that migration range is on a single zone so
+                * we can use the nid of the first page to all the others.
+                */
+               mtc.nid = page_to_nid(list_first_entry(&source, struct page, lru));
+
+               /*
+                * try to allocate from a different node but reuse this node
+                * if there are no other online nodes to be used (e.g. we are
+                * offlining a part of the only existing node)
+                */
+               node_clear(mtc.nid, nmask);
+               if (nodes_empty(nmask))
+                       node_set(mtc.nid, nmask);
+               ret = migrate_pages(&source, alloc_migration_target, NULL,
+                       (unsigned long)&mtc, MIGRATE_SYNC, MR_MEMORY_HOTPLUG);
                if (ret) {
                        list_for_each_entry(page, &source, lru) {
                                pr_warn("migrating pfn %lx failed ret:%d ",