revert "memory hotplug: allocate usemap on the section with pgdat"

[linux-2.6-omap-h63xx.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index d9409ba7a1a174c1db4b70273dd21edc52ea0b57..36511c7b5e2c797067ccb539646f580aa8ec1012 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -250,22 +250,11 @@ static unsigned long *__kmalloc_section_usemap(void)
 
 static unsigned long *__init sparse_early_usemap_alloc(unsigned long pnum)
 {
-       unsigned long *usemap, section_nr;
+       unsigned long *usemap;
        struct mem_section *ms = __nr_to_section(pnum);
        int nid = sparse_early_nid(ms);
-       struct pglist_data *pgdat = NODE_DATA(nid);
 
-       /*
-        * Usemap's page can't be freed until freeing other sections
-        * which use it. And, Pgdat has same feature.
-        * If section A has pgdat and section B has usemap for other
-        * sections (includes section A), both sections can't be removed,
-        * because there is the dependency each other.
-        * To solve above issue, this collects all usemap on the same section
-        * which has pgdat.
-        */
-       section_nr = pfn_to_section_nr(__pa(pgdat) >> PAGE_SHIFT);
-       usemap = alloc_bootmem_section(usemap_size(), section_nr);
+       usemap = alloc_bootmem_node(NODE_DATA(nid), usemap_size());
        if (usemap)
                return usemap;