aboutsummaryrefslogtreecommitdiffstats
path: root/mm/sparse.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/sparse.c')
-rw-r--r--mm/sparse.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/mm/sparse.c b/mm/sparse.c
index eb31274aae8b..eb188eb6b82d 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -484,10 +484,12 @@ void __weak __meminit vmemmap_populate_print_last(void)
484/** 484/**
485 * alloc_usemap_and_memmap - memory alloction for pageblock flags and vmemmap 485 * alloc_usemap_and_memmap - memory alloction for pageblock flags and vmemmap
486 * @map: usemap_map for pageblock flags or mmap_map for vmemmap 486 * @map: usemap_map for pageblock flags or mmap_map for vmemmap
487 * @unit_size: size of map unit
487 */ 488 */
488static void __init alloc_usemap_and_memmap(void (*alloc_func) 489static void __init alloc_usemap_and_memmap(void (*alloc_func)
489 (void *, unsigned long, unsigned long, 490 (void *, unsigned long, unsigned long,
490 unsigned long, int), void *data) 491 unsigned long, int), void *data,
492 int data_unit_size)
491{ 493{
492 unsigned long pnum; 494 unsigned long pnum;
493 unsigned long map_count; 495 unsigned long map_count;
@@ -564,7 +566,8 @@ void __init sparse_init(void)
564 if (!usemap_map) 566 if (!usemap_map)
565 panic("can not allocate usemap_map\n"); 567 panic("can not allocate usemap_map\n");
566 alloc_usemap_and_memmap(sparse_early_usemaps_alloc_node, 568 alloc_usemap_and_memmap(sparse_early_usemaps_alloc_node,
567 (void *)usemap_map); 569 (void *)usemap_map,
570 sizeof(usemap_map[0]));
568 571
569#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER 572#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER
570 size2 = sizeof(struct page *) * NR_MEM_SECTIONS; 573 size2 = sizeof(struct page *) * NR_MEM_SECTIONS;
@@ -572,7 +575,8 @@ void __init sparse_init(void)
572 if (!map_map) 575 if (!map_map)
573 panic("can not allocate map_map\n"); 576 panic("can not allocate map_map\n");
574 alloc_usemap_and_memmap(sparse_early_mem_maps_alloc_node, 577 alloc_usemap_and_memmap(sparse_early_mem_maps_alloc_node,
575 (void *)map_map); 578 (void *)map_map,
579 sizeof(map_map[0]));
576#endif 580#endif
577 581
578 for_each_present_section_nr(0, pnum) { 582 for_each_present_section_nr(0, pnum) {