Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64dd1b29 authored by Cody P Schafer's avatar Cody P Schafer Committed by Linus Torvalds
Browse files

mm/memory_hotplug: use ensure_zone_is_initialized() 



Remove open coding of ensure_zone_is_initialzied().

Signed-off-by: default avatarCody P Schafer <cody@linux.vnet.ibm.com>
Cc: David Hansen <dave@linux.vnet.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6bbb78e

mm/memory_hotplug.c

+10 −19
Original line number Diff line number Diff line
@@ -300,12 +300,9 @@ static int __meminit move_pfn_range_left(struct zone *z1, struct zone *z2, 
	unsigned long flags;

	unsigned long z1_start_pfn;



	if (!z1->wait_table) {

		ret = init_currently_empty_zone(z1, start_pfn,

			end_pfn - start_pfn, MEMMAP_HOTPLUG);

	ret = ensure_zone_is_initialized(z1, start_pfn, end_pfn - start_pfn);

	if (ret)

		return ret;

	}



	pgdat_resize_lock(z1->zone_pgdat, &flags);
@@ -345,12 +342,9 @@ static int __meminit move_pfn_range_right(struct zone *z1, struct zone *z2, 
	unsigned long flags;

	unsigned long z2_end_pfn;



	if (!z2->wait_table) {

		ret = init_currently_empty_zone(z2, start_pfn,

			end_pfn - start_pfn, MEMMAP_HOTPLUG);

	ret = ensure_zone_is_initialized(z2, start_pfn, end_pfn - start_pfn);

	if (ret)

		return ret;

	}



	pgdat_resize_lock(z1->zone_pgdat, &flags);
@@ -403,16 +397,13 @@ static int __meminit __add_zone(struct zone *zone, unsigned long phys_start_pfn) 
	int nid = pgdat->node_id;

	int zone_type;

	unsigned long flags;



	zone_type = zone - pgdat->node_zones;

	if (!zone->wait_table) {

	int ret;



		ret = init_currently_empty_zone(zone, phys_start_pfn,

						nr_pages, MEMMAP_HOTPLUG);

	zone_type = zone - pgdat->node_zones;

	ret = ensure_zone_is_initialized(zone, phys_start_pfn, nr_pages);

	if (ret)

		return ret;

	}



	pgdat_resize_lock(zone->zone_pgdat, &flags);

	grow_zone_span(zone, phys_start_pfn, phys_start_pfn + nr_pages);

	grow_pgdat_span(zone->zone_pgdat, phys_start_pfn,