aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memory_hotplug.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 988bd91b9f7f..656ad1c65422 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -404,8 +404,15 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
404 if (!populated_zone(zone)) 404 if (!populated_zone(zone))
405 need_zonelists_rebuild = 1; 405 need_zonelists_rebuild = 1;
406 406
407 walk_memory_resource(pfn, nr_pages, &onlined_pages, 407 ret = walk_memory_resource(pfn, nr_pages, &onlined_pages,
408 online_pages_range); 408 online_pages_range);
409 if (ret) {
410 printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
411 nr_pages, pfn);
412 memory_notify(MEM_CANCEL_ONLINE, &arg);
413 return ret;
414 }
415
409 zone->present_pages += onlined_pages; 416 zone->present_pages += onlined_pages;
410 zone->zone_pgdat->node_present_pages += onlined_pages; 417 zone->zone_pgdat->node_present_pages += onlined_pages;
411 418