Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

[~andy/linux] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index a918f77f02f3bb42bc4b11bab07e20ffd1773c5d..1fe76d963ac21a2d09d5d8cb8e21e687163202f1 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -130,6 +130,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
                onlined_pages++;
        }
        zone->present_pages += onlined_pages;
+       zone->zone_pgdat->node_present_pages += onlined_pages;
 
        setup_per_zone_pages_min();