| Message ID | 20201220082754.6900-6-bhe@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix the incorrect memmep defer init handling and do some cleanup | expand |
On Sun, Dec 20, 2020 at 04:27:54PM +0800, Baoquan He wrote: > Local variable 'zone_start_pfn' is not needed since there's only > one call site in free_area_init_core(). Let's remove it and pass > zone->zone_start_pfn directly to init_currently_empty_zone(). > > Signed-off-by: Baoquan He <bhe@redhat.com> Reviewed-by: Mike Rapoport <rppt@linux.ibm.com> > --- > mm/page_alloc.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 7f0a917ab858..189a86253c93 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -6986,7 +6986,6 @@ static void __init free_area_init_core(struct pglist_data *pgdat) > for (j = 0; j < MAX_NR_ZONES; j++) { > struct zone *zone = pgdat->node_zones + j; > unsigned long size, freesize, memmap_pages; > - unsigned long zone_start_pfn = zone->zone_start_pfn; > > size = zone->spanned_pages; > freesize = zone->present_pages; > @@ -7035,7 +7034,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat) > > set_pageblock_order(); > setup_usemap(zone); > - init_currently_empty_zone(zone, zone_start_pfn, size); > + init_currently_empty_zone(zone, zone->zone_start_pfn, size); > memmap_init_zone(zone); > } > } > -- > 2.17.2 >
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7f0a917ab858..189a86253c93 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6986,7 +6986,6 @@ static void __init free_area_init_core(struct pglist_data *pgdat) for (j = 0; j < MAX_NR_ZONES; j++) { struct zone *zone = pgdat->node_zones + j; unsigned long size, freesize, memmap_pages; - unsigned long zone_start_pfn = zone->zone_start_pfn; size = zone->spanned_pages; freesize = zone->present_pages; @@ -7035,7 +7034,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat) set_pageblock_order(); setup_usemap(zone); - init_currently_empty_zone(zone, zone_start_pfn, size); + init_currently_empty_zone(zone, zone->zone_start_pfn, size); memmap_init_zone(zone); } }
Local variable 'zone_start_pfn' is not needed since there's only one call site in free_area_init_core(). Let's remove it and pass zone->zone_start_pfn directly to init_currently_empty_zone(). Signed-off-by: Baoquan He <bhe@redhat.com> --- mm/page_alloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)