diff options
| author | Keith Mannthey <kmannth@us.ibm.com> | 2006-10-01 02:27:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:18 -0400 |
| commit | 53947027ad90542ddb2bb746e3175827c270610a (patch) | |
| tree | 385add6ef71095c9dba4c23ef778d92502de1086 /mm | |
| parent | 8c2676a5870ab15cbeea9f826266bc946fe3cc26 (diff) | |
[PATCH] hot-add-mem x86_64: use CONFIG_MEMORY_HOTPLUG_SPARSE
Migate CONFIG_MEMORY_HOTPLUG to CONFIG_MEMORY_HOTPLUG_SPARSE where needed.
Signed-off-by: Keith Mannthey <kmannth@us.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory_hotplug.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 63b14d4f68fb..7666dbd328df 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/tlbflush.h> | 27 | #include <asm/tlbflush.h> |
| 28 | 28 | ||
| 29 | #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE | ||
| 29 | static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) | 30 | static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) |
| 30 | { | 31 | { |
| 31 | struct pglist_data *pgdat = zone->zone_pgdat; | 32 | struct pglist_data *pgdat = zone->zone_pgdat; |
| @@ -192,6 +193,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages) | |||
| 192 | writeback_set_ratelimit(); | 193 | writeback_set_ratelimit(); |
| 193 | return 0; | 194 | return 0; |
| 194 | } | 195 | } |
| 196 | #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ | ||
| 195 | 197 | ||
| 196 | static pg_data_t *hotadd_new_pgdat(int nid, u64 start) | 198 | static pg_data_t *hotadd_new_pgdat(int nid, u64 start) |
| 197 | { | 199 | { |