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 7af5e7a92528..65bb52599f90 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -427,10 +427,6 @@ struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid, | |||
427 | struct page *map; | 427 | struct page *map; |
428 | unsigned long size; | 428 | unsigned long size; |
429 | 429 | ||
430 | map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION); | ||
431 | if (map) | ||
432 | return map; | ||
433 | |||
434 | size = PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); | 430 | size = PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); |
435 | map = memblock_virt_alloc_try_nid(size, | 431 | map = memblock_virt_alloc_try_nid(size, |
436 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), | 432 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), |
@@ -446,17 +442,6 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, | |||
446 | unsigned long pnum; | 442 | unsigned long pnum; |
447 | unsigned long size = sizeof(struct page) * PAGES_PER_SECTION; | 443 | unsigned long size = sizeof(struct page) * PAGES_PER_SECTION; |
448 | 444 | ||
449 | map = alloc_remap(nodeid, size * map_count); | ||
450 | if (map) { | ||
451 | for (pnum = pnum_begin; pnum < pnum_end; pnum++) { | ||
452 | if (!present_section_nr(pnum)) | ||
453 | continue; | ||
454 | map_map[pnum] = map; | ||
455 | map += size; | ||
456 | } | ||
457 | return; | ||
458 | } | ||
459 | |||
460 | size = PAGE_ALIGN(size); | 445 | size = PAGE_ALIGN(size); |
461 | map = memblock_virt_alloc_try_nid_raw(size * map_count, | 446 | map = memblock_virt_alloc_try_nid_raw(size * map_count, |
462 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), | 447 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), |