mm, sparse: pass nid instead of pgdat to sparse_add_one_section()

[sfrench/cifs-2.6.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 7323a03fbc39ca9a39a5e885562bd8df2177c269..7ea5dc6c6b19a1a4fc86432b7a1cce1ca6ea5301 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -678,8 +678,8 @@ static void free_map_bootmem(struct page *memmap)
  * set.  If this is <=0, then that means that the passed-in
  * map was not consumed and must be freed.
  */
-int __meminit sparse_add_one_section(struct pglist_data *pgdat,
-               unsigned long start_pfn, struct vmem_altmap *altmap)
+int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
+                                    struct vmem_altmap *altmap)
 {
        unsigned long section_nr = pfn_to_section_nr(start_pfn);
        struct mem_section *ms;
@@ -691,11 +691,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat,
         * no locking for this, because it does its own
         * plus, it does a kmalloc
         */
-       ret = sparse_index_init(section_nr, pgdat->node_id);
+       ret = sparse_index_init(section_nr, nid);
        if (ret < 0 && ret != -EEXIST)
                return ret;
        ret = 0;
-       memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap);
+       memmap = kmalloc_section_memmap(section_nr, nid, altmap);
        if (!memmap)
                return -ENOMEM;
        usemap = __kmalloc_section_usemap();