On 6/1/21 10:14 AM, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > The patch titled > Subject: mmmemory_hotplug-drop-unneeded-locking-fix > has been added to the -mm tree. Its filename is > mmmemory_hotplug-drop-unneeded-locking-fix.patch > > This patch should soon appear at > https://ozlabs.org/~akpm/mmots/broken-out/mmmemory_hotplug-drop-unneeded-locking-fix.patch > and later at > https://ozlabs.org/~akpm/mmotm/broken-out/mmmemory_hotplug-drop-unneeded-locking-fix.patch > > Before you just go and hit "reply", please: > a) Consider who else should be cc'ed > b) Prefer to cc a suitable mailing list as well > c) Ideally: find the original patch on the mailing list and do a > reply-to-all to that, adding suitable additional cc's > > *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** > > The -mm tree is included into linux-next and is updated > there every 3-4 working days > > ------------------------------------------------------ > From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Subject: mmmemory_hotplug-drop-unneeded-locking-fix > > remove now-unused locals > > Cc: Anshuman Khandual <anshuman.khandual@xxxxxxx> > Cc: David Hildenbrand <david@xxxxxxxxxx> > Cc: Michal Hocko <mhocko@xxxxxxxx> > Cc: Oscar Salvador <osalvador@xxxxxxx> > Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx> > Cc: Vlastimil Babka <vbabka@xxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > mm/memory_hotplug.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > --- a/mm/memory_hotplug.c~mmmemory_hotplug-drop-unneeded-locking-fix > +++ a/mm/memory_hotplug.c > @@ -397,7 +397,7 @@ void __ref remove_pfn_range_from_zone(st > { > const unsigned long end_pfn = start_pfn + nr_pages; > struct pglist_data *pgdat = zone->zone_pgdat; > - unsigned long pfn, cur_nr_pages, flags; > + unsigned long pfn, cur_nr_pages; > > /* Poison struct pages because they are now uninitialized again. */ > for (pfn = start_pfn; pfn < end_pfn; pfn += cur_nr_pages) { > @@ -630,7 +630,6 @@ void __ref move_pfn_range_to_zone(struct > { > struct pglist_data *pgdat = zone->zone_pgdat; > int nid = pgdat->node_id; > - unsigned long flags; > > clear_zone_contiguous(zone); > > @@ -727,8 +726,6 @@ struct zone *zone_for_pfn_range(int onli > */ > void adjust_present_page_count(struct zone *zone, long nr_pages) > { > - unsigned long flags; > - > zone->present_pages += nr_pages; > zone->zone_pgdat->node_present_pages += nr_pages; > } > _ Yeah indeed. Without this patch, there are some build warnings. mm/memory_hotplug.c: In function ‘remove_pfn_range_from_zone’: mm/memory_hotplug.c:516:35: warning: unused variable ‘flags’ [-Wunused-variable] unsigned long pfn, cur_nr_pages, flags; ^~~~~ mm/memory_hotplug.c: In function ‘move_pfn_range_to_zone’: mm/memory_hotplug.c:749:16: warning: unused variable ‘flags’ [-Wunused-variable] unsigned long flags; ^~~~~ mm/memory_hotplug.c: In function ‘adjust_present_page_count’: mm/memory_hotplug.c:846:16: warning: unused variable ‘flags’ [-Wunused-variable] unsigned long flags; ^~~~~
