summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Liu <kent.liu@linux.intel.com>2008-07-23 21:28:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 10:47:21 -0700
commit2f7f24eca31c4fc2fdb134b2ef743ccd67cfb9a9 (patch)
tree6c2169b8a7b160cbacdc41f376a4e2dea993e579
parentaf370fb8cb3031f20438f246798d5f0d98089f29 (diff)
downloadlinux-2f7f24eca31c4fc2fdb134b2ef743ccd67cfb9a9.tar.bz2
memory-hotplug: don't calculate vm_total_pages twice when rebuilding zonelists in online_pages()
If zonelist is required to be rebuilt in online_pages(), there is no need to recalculate vm_total_pages in that function, as it has been updated in the call build_all_zonelists(). Signed-off-by: Kent Liu <kent.liu@linux.intel.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memory_hotplug.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 0fb05b258f0c..93aba78dc8b6 100644
--- a/mm/memory_hotplug.c
+++ b/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)