diff options
author | Jan Beulich <JBeulich@novell.com> | 2009-09-21 20:03:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:38 -0400 |
commit | 4738e1b9cf8f9e28d7de080a5e6ce5d0095ea18f (patch) | |
tree | 96804aacfd79495dbb787055473f92ccb6dab65d | |
parent | 78986a678f6ec3759a01976749f4437d8bf2d6c3 (diff) |
memory hotplug: fix updating of num_physpages for hot plugged memory
Sizing of memory allocations shouldn't depend on the number of physical
pages found in a system, as that generally includes (perhaps a huge amount
of) non-RAM pages. The amount of what actually is usable as storage
should instead be used as a basis here.
In line with that, the memory hotplug code should update num_physpages in
a way that it retains its original (post-boot) meaning; in particular,
decreasing the value should at best be done with great care - this patch
doesn't try to ever decrease this value at all as it doesn't really seem
meaningful to do so.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/memory_hotplug.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 616236e6343f..efe3e0ec2e61 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -339,8 +339,11 @@ EXPORT_SYMBOL_GPL(__remove_pages); | |||
339 | 339 | ||
340 | void online_page(struct page *page) | 340 | void online_page(struct page *page) |
341 | { | 341 | { |
342 | unsigned long pfn = page_to_pfn(page); | ||
343 | |||
342 | totalram_pages++; | 344 | totalram_pages++; |
343 | num_physpages++; | 345 | if (pfn >= num_physpages) |
346 | num_physpages = pfn + 1; | ||
344 | 347 | ||
345 | #ifdef CONFIG_HIGHMEM | 348 | #ifdef CONFIG_HIGHMEM |
346 | if (PageHighMem(page)) | 349 | if (PageHighMem(page)) |
@@ -832,7 +835,6 @@ repeat: | |||
832 | zone->present_pages -= offlined_pages; | 835 | zone->present_pages -= offlined_pages; |
833 | zone->zone_pgdat->node_present_pages -= offlined_pages; | 836 | zone->zone_pgdat->node_present_pages -= offlined_pages; |
834 | totalram_pages -= offlined_pages; | 837 | totalram_pages -= offlined_pages; |
835 | num_physpages -= offlined_pages; | ||
836 | 838 | ||
837 | setup_per_zone_wmarks(); | 839 | setup_per_zone_wmarks(); |
838 | calculate_zone_inactive_ratio(zone); | 840 | calculate_zone_inactive_ratio(zone); |