diff --git a/[refs] b/[refs]
index 55dde020ec2f..10c1cd084480 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78986a678f6ec3759a01976749f4437d8bf2d6c3
+refs/heads/master: 4738e1b9cf8f9e28d7de080a5e6ce5d0095ea18f
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index 616236e6343f..efe3e0ec2e61 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -339,8 +339,11 @@ EXPORT_SYMBOL_GPL(__remove_pages);
 
 void online_page(struct page *page)
 {
+	unsigned long pfn = page_to_pfn(page);
+
 	totalram_pages++;
-	num_physpages++;
+	if (pfn >= num_physpages)
+		num_physpages = pfn + 1;
 
 #ifdef CONFIG_HIGHMEM
 	if (PageHighMem(page))
@@ -832,7 +835,6 @@ int offline_pages(unsigned long start_pfn,
 	zone->present_pages -= offlined_pages;
 	zone->zone_pgdat->node_present_pages -= offlined_pages;
 	totalram_pages -= offlined_pages;
-	num_physpages -= offlined_pages;
 
 	setup_per_zone_wmarks();
 	calculate_zone_inactive_ratio(zone);