UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mm: simplify parameter of setup_usemap() 

Parameter 'zone' has got needed information, let's remove other
unnecessary parameters.

Link: https://lkml.kernel.org/r/20210122135956.5946-5-bhe@redhat.com
Signed-off-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.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 2021-02-24 12:06:20 -08:00 committed by Linus Torvalds
parent 3256ff83c5
commit 7010a6eca4
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mm/page_alloc.c
View File

@ -6765,25 +6765,22 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l
return usemapsize / 8; return usemapsize / 8;
} }
static void __ref setup_usemap(struct pglist_data *pgdat, static void __ref setup_usemap(struct zone *zone)
struct zone *zone,
unsigned long zone_start_pfn,
unsigned long zonesize)
{ {
unsigned long usemapsize = usemap_size(zone_start_pfn, zonesize); unsigned long usemapsize = usemap_size(zone->zone_start_pfn,
zone->spanned_pages);
zone->pageblock_flags = NULL; zone->pageblock_flags = NULL;
if (usemapsize) { if (usemapsize) {
zone->pageblock_flags = zone->pageblock_flags =
memblock_alloc_node(usemapsize, SMP_CACHE_BYTES, memblock_alloc_node(usemapsize, SMP_CACHE_BYTES,
pgdat->node_id); zone_to_nid(zone));
if (!zone->pageblock_flags) if (!zone->pageblock_flags)
panic("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n", panic("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n",
usemapsize, zone->name, pgdat->node_id); usemapsize, zone->name, zone_to_nid(zone));
} }
} }
#else #else
static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone, static inline void setup_usemap(struct zone *zone) {}
unsigned long zone_start_pfn, unsigned long zonesize) {}
#endif /* CONFIG_SPARSEMEM */ #endif /* CONFIG_SPARSEMEM */
#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@ -6978,7 +6975,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)
continue; continue;
set_pageblock_order(); set_pageblock_order();
setup_usemap(pgdat, zone, zone_start_pfn, size); setup_usemap(zone);
init_currently_empty_zone(zone, zone_start_pfn, size); init_currently_empty_zone(zone, zone_start_pfn, size);
memmap_init_zone(zone); memmap_init_zone(zone);
} }