Skip to content

Commit

Permalink
mm/sparse.c: add a new parameter 'data_unit_size' for alloc_usemap_an…
Browse files Browse the repository at this point in the history
…d_memmap

It's used to pass the size of map data unit into alloc_usemap_and_memmap,
and is preparation for next patch.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Baoquan He <[email protected]>
Reviewed-by: Pavel Tatashin <[email protected]>
Reviewed-by: Oscar Salvador <[email protected]>
Cc: Kirill A. Shutemov <[email protected]>
Cc: Pankaj Gupta <[email protected]>
Cc: Dave Hansen <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Stephen Rothwell <[email protected]>
  • Loading branch information
Baoquan He authored and sfrothwell committed Jul 28, 2018
1 parent b23605d commit 00f38b7
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions mm/sparse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -564,15 +566,17 @@ 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;
map_map = memblock_virt_alloc(size2, 0);
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) {
Expand Down

0 comments on commit 00f38b7

Please sign in to comment.