aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memory_hotplug.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index b17dca7249f8..988bd91b9f7f 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -167,13 +167,9 @@ static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)
167 int zone_type; 167 int zone_type;
168 168
169 zone_type = zone - pgdat->node_zones; 169 zone_type = zone - pgdat->node_zones;
170 if (!zone->wait_table) { 170 if (!zone->wait_table)
171 int ret = 0; 171 return init_currently_empty_zone(zone, phys_start_pfn,
172 ret = init_currently_empty_zone(zone, phys_start_pfn, 172 nr_pages, MEMMAP_HOTPLUG);
173 nr_pages, MEMMAP_HOTPLUG);
174 if (ret < 0)
175 return ret;
176 }
177 memmap_init_zone(nr_pages, nid, zone_type, 173 memmap_init_zone(nr_pages, nid, zone_type,
178 phys_start_pfn, MEMMAP_HOTPLUG); 174 phys_start_pfn, MEMMAP_HOTPLUG);
179 return 0; 175 return 0;