Messages in this thread Patch in this message | | | From | Cody P Schafer <> | Subject | [PATCH 14/17] mm/memory_hotplug: factor out zone+pgdat growth. | Date | Tue, 15 Jan 2013 16:24:51 -0800 |
| |
Create a new function grow_pgdat_and_zone() which handles locking + growth of a zone & the pgdat which it is associated with.
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> --- mm/memory_hotplug.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0a74b86a..c6149a3 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -361,6 +361,16 @@ static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn, pgdat->node_start_pfn; } +static void grow_pgdat_and_zone(struct zone *zone, unsigned long start_pfn, + unsigned long end_pfn) +{ + unsigned long flags; + pgdat_resize_lock(zone->zone_pgdat, &flags); + grow_zone_span(zone, start_pfn, end_pfn); + grow_pgdat_span(zone->zone_pgdat, start_pfn, end_pfn); + pgdat_resize_unlock(zone->zone_pgdat, &flags); +} + static int __meminit __add_zone(struct zone *zone, unsigned long phys_start_pfn) { struct pglist_data *pgdat = zone->zone_pgdat; @@ -375,11 +385,7 @@ static int __meminit __add_zone(struct zone *zone, unsigned long phys_start_pfn) 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, - phys_start_pfn + nr_pages); - pgdat_resize_unlock(zone->zone_pgdat, &flags); + grow_pgdat_and_zone(zone, phys_start_pfn, phys_start_pfn + nr_pages); memmap_init_zone(nr_pages, nid, zone_type, phys_start_pfn, MEMMAP_HOTPLUG); return 0; -- 1.8.0.3
| |