p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mm/sparse.c: add a new parameter 'data_unit_size' for alloc_usemap_and_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/20180228032657.32385-4-bhe@redhat.com
Signed-off-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Cc: Pasha Tatashin <Pavel.Tatashin@microsoft.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Pankaj Gupta <pagupta@redhat.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Baoquan He 2018-08-17 15:48:45 -07:00 committed by Linus Torvalds
parent 07a34a8c36
commit 9258631b33
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mm/sparse.c
View File

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