diff options
Diffstat (limited to 'mm/sparse.c')
-rw-r--r-- | mm/sparse.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index 79b26f98d793..58cab483e81b 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -405,10 +405,6 @@ struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid, | |||
405 | struct page *map; | 405 | struct page *map; |
406 | unsigned long size; | 406 | unsigned long size; |
407 | 407 | ||
408 | map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION); | ||
409 | if (map) | ||
410 | return map; | ||
411 | |||
412 | size = PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); | 408 | size = PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); |
413 | map = memblock_virt_alloc_try_nid(size, | 409 | map = memblock_virt_alloc_try_nid(size, |
414 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), | 410 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), |
@@ -424,17 +420,6 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, | |||
424 | unsigned long pnum; | 420 | unsigned long pnum; |
425 | unsigned long size = sizeof(struct page) * PAGES_PER_SECTION; | 421 | unsigned long size = sizeof(struct page) * PAGES_PER_SECTION; |
426 | 422 | ||
427 | map = alloc_remap(nodeid, size * map_count); | ||
428 | if (map) { | ||
429 | for (pnum = pnum_begin; pnum < pnum_end; pnum++) { | ||
430 | if (!present_section_nr(pnum)) | ||
431 | continue; | ||
432 | map_map[pnum] = map; | ||
433 | map += size; | ||
434 | } | ||
435 | return; | ||
436 | } | ||
437 | |||
438 | size = PAGE_ALIGN(size); | 423 | size = PAGE_ALIGN(size); |
439 | map = memblock_virt_alloc_try_nid_raw(size * map_count, | 424 | map = memblock_virt_alloc_try_nid_raw(size * map_count, |
440 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), | 425 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), |