|
@@ -484,10 +484,12 @@ void __weak __meminit vmemmap_populate_print_last(void)
|
|
|
/**
|
|
|
* alloc_usemap_and_memmap - memory alloction for pageblock flags and vmemmap
|
|
|
* @map: usemap_map for pageblock flags or mmap_map for vmemmap
|
|
|
+ * @unit_size: size of map unit
|
|
|
*/
|
|
|
static void __init alloc_usemap_and_memmap(void (*alloc_func)
|
|
|
(void *, unsigned long, unsigned long,
|
|
|
- unsigned long, int), void *data)
|
|
|
+ unsigned long, int), void *data,
|
|
|
+ int data_unit_size)
|
|
|
{
|
|
|
unsigned long pnum;
|
|
|
unsigned long map_count;
|
|
@@ -564,7 +566,8 @@ void __init sparse_init(void)
|
|
|
if (!usemap_map)
|
|
|
panic("can not allocate usemap_map\n");
|
|
|
alloc_usemap_and_memmap(sparse_early_usemaps_alloc_node,
|
|
|
- (void *)usemap_map);
|
|
|
+ (void *)usemap_map,
|
|
|
+ sizeof(usemap_map[0]));
|
|
|
|
|
|
#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER
|
|
|
size2 = sizeof(struct page *) * NR_MEM_SECTIONS;
|
|
@@ -572,7 +575,8 @@ void __init sparse_init(void)
|
|
|
if (!map_map)
|
|
|
panic("can not allocate map_map\n");
|
|
|
alloc_usemap_and_memmap(sparse_early_mem_maps_alloc_node,
|
|
|
- (void *)map_map);
|
|
|
+ (void *)map_map,
|
|
|
+ sizeof(map_map[0]));
|
|
|
#endif
|
|
|
|
|
|
for_each_present_section_nr(0, pnum) {
|