From 11d0fd92e355e186cea7ea855195a8a8e4ec2218 Mon Sep 17 00:00:00 2001
From: Kent Liu <kent.liu@linux.intel.com>
Date: Wed, 23 Jul 2008 21:28:18 -0700
Subject: [PATCH] --- yaml --- r: 105343 b: refs/heads/master c:
 2f7f24eca31c4fc2fdb134b2ef743ccd67cfb9a9 h: refs/heads/master i:   105341:
 53a58840189664cf37e88a94627f8c183f2a81f6   105339:
 be8c6d2f45e61d0d53dc9c8ff566a27788baf27d   105335:
 803b910c960583d7a8784407d515cf9c2576e578   105327:
 54cd8655ac5487dc289c22450b543d4604182076   105311:
 97e2260a1ff33cd57f7a14198106986eaf9f3828   105279:
 812b1ae8cef93959ab3db8553d9ce86292f3fea9   105215:
 f6ea963091642f57d36c54bc55f84119f07d816f v: v3

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

diff --git a/[refs] b/[refs]
index 36ddeed778d3..4ebd144ae72a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af370fb8cb3031f20438f246798d5f0d98089f29
+refs/heads/master: 2f7f24eca31c4fc2fdb134b2ef743ccd67cfb9a9
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index 0fb05b258f0c..93aba78dc8b6 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -429,7 +429,9 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
 
 	if (need_zonelists_rebuild)
 		build_all_zonelists();
-	vm_total_pages = nr_free_pagecache_pages();
+	else
+		vm_total_pages = nr_free_pagecache_pages();
+
 	writeback_set_ratelimit();
 
 	if (onlined_pages)