mm, page_alloc: pass preferred nid instead of zonelist to allocator

[karo-tx-linux.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index e4fdb97b6ef28115108dd39c8a20525ac931bc1c..9ac997b8f2a6404240378827d1b6df736562c5ef 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1459,11 +1459,9 @@ static struct page *new_node_page(struct page *page, unsigned long private,
                gfp_mask |= __GFP_HIGHMEM;
 
        if (!nodes_empty(nmask))
-               new_page = __alloc_pages_nodemask(gfp_mask, 0,
-                                       node_zonelist(nid, gfp_mask), &nmask);
+               new_page = __alloc_pages_nodemask(gfp_mask, 0, nid, &nmask);
        if (!new_page)
-               new_page = __alloc_pages(gfp_mask, 0,
-                                       node_zonelist(nid, gfp_mask));
+               new_page = __alloc_pages(gfp_mask, 0, nid);
 
        return new_page;
 }