From 98320091537d76532fa199ce7e64b803fd72dfc6 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@novell.com>
Date: Mon, 21 Sep 2009 17:03:03 -0700
Subject: [PATCH] --- yaml --- r: 164451 b: refs/heads/master c:
 4738e1b9cf8f9e28d7de080a5e6ce5d0095ea18f h: refs/heads/master i:   164449:
 27f9875b599c99074aeaf794f497a09e6a127709   164447:
 2f36e9abf4f1db576b90664e0cfca40d55752292 v: v3

---
 [refs]                    | 2 +-
 trunk/mm/memory_hotplug.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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);