diff options
-rw-r--r-- | mm/sparse.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index d9409ba7a1a1..36511c7b5e2c 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -250,22 +250,11 @@ static unsigned long *__kmalloc_section_usemap(void) | |||
250 | 250 | ||
251 | static unsigned long *__init sparse_early_usemap_alloc(unsigned long pnum) | 251 | static unsigned long *__init sparse_early_usemap_alloc(unsigned long pnum) |
252 | { | 252 | { |
253 | unsigned long *usemap, section_nr; | 253 | unsigned long *usemap; |
254 | struct mem_section *ms = __nr_to_section(pnum); | 254 | struct mem_section *ms = __nr_to_section(pnum); |
255 | int nid = sparse_early_nid(ms); | 255 | int nid = sparse_early_nid(ms); |
256 | struct pglist_data *pgdat = NODE_DATA(nid); | ||
257 | 256 | ||
258 | /* | 257 | usemap = alloc_bootmem_node(NODE_DATA(nid), usemap_size()); |
259 | * Usemap's page can't be freed until freeing other sections | ||
260 | * which use it. And, Pgdat has same feature. | ||
261 | * If section A has pgdat and section B has usemap for other | ||
262 | * sections (includes section A), both sections can't be removed, | ||
263 | * because there is the dependency each other. | ||
264 | * To solve above issue, this collects all usemap on the same section | ||
265 | * which has pgdat. | ||
266 | */ | ||
267 | section_nr = pfn_to_section_nr(__pa(pgdat) >> PAGE_SHIFT); | ||
268 | usemap = alloc_bootmem_section(usemap_size(), section_nr); | ||
269 | if (usemap) | 258 | if (usemap) |
270 | return usemap; | 259 | return usemap; |
271 | 260 | ||