diff --git a/[refs] b/[refs] index 15c0327f4ee8..272d6f9b9812 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b7ec117bf6c98f5a845311c4ca5ca020a3d7689 +refs/heads/master: c3723ca3874a8fc2218c4726d57e3a7da9e83e47 diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c index b17dca7249f8..988bd91b9f7f 100644 --- a/trunk/mm/memory_hotplug.c +++ b/trunk/mm/memory_hotplug.c @@ -167,13 +167,9 @@ static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) int zone_type; zone_type = zone - pgdat->node_zones; - if (!zone->wait_table) { - int ret = 0; - ret = init_currently_empty_zone(zone, phys_start_pfn, - nr_pages, MEMMAP_HOTPLUG); - if (ret < 0) - return ret; - } + if (!zone->wait_table) + return init_currently_empty_zone(zone, phys_start_pfn, + nr_pages, MEMMAP_HOTPLUG); memmap_init_zone(nr_pages, nid, zone_type, phys_start_pfn, MEMMAP_HOTPLUG); return 0;