mmmemory_hotplug-drop-unneeded-locking-fix

remove now-unused locals

Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index ea1ab14e90f112e16d7855cf5c40ece59167f174..e136013128b0920302811a844c7db4e69f0ab58f 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -397,7 +397,7 @@ void __ref remove_pfn_range_from_zone(struct zone *zone,
 {
        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 zone *zone, unsigned long start_pfn,
 {
        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 online_type, int nid, unsigned start_pfn,
  */
 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;
 }