lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] hot-add-mem x86_64: use CONFIG_MEMORY_HOTPLUG_SPARSE

Browse Source 
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>
This commit is contained in:
Keith Mannthey
2006-09-30 23:27:08 -07:00
committed by Linus Torvalds
parent 8c2676a587
commit 53947027ad
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/Makefile
View File

@@ -8,7 +8,7 @@ obj-y += power/
obj-$(CONFIG_ISA) += isa.o obj-$(CONFIG_ISA) += isa.o
obj-$(CONFIG_FW_LOADER) += firmware_class.o obj-$(CONFIG_FW_LOADER) += firmware_class.o
obj-$(CONFIG_NUMA) += node.o obj-$(CONFIG_NUMA) += node.o
obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
obj-$(CONFIG_SMP) += topology.o obj-$(CONFIG_SMP) += topology.o
obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o

4
include/linux/memory.h
View File

@@ -57,7 +57,7 @@ struct memory_block {
struct notifier_block; struct notifier_block;
struct mem_section; struct mem_section;
#ifndef CONFIG_MEMORY_HOTPLUG #ifndef CONFIG_MEMORY_HOTPLUG_SPARSE
static inline int memory_dev_init(void) static inline int memory_dev_init(void)
{ {
return 0; return 0;
@@ -78,7 +78,7 @@ extern int remove_memory_block(unsigned long, struct mem_section *, int);
#define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT) #define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT)
#endif /* CONFIG_MEMORY_HOTPLUG */ #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
#define hotplug_memory_notifier(fn, pri) { \ #define hotplug_memory_notifier(fn, pri) { \
static struct notifier_block fn##_mem_nb = \ static struct notifier_block fn##_mem_nb = \

2
mm/memory_hotplug.c
View File

@@ -26,6 +26,7 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)
{ {
struct pglist_data *pgdat = zone->zone_pgdat; struct pglist_data *pgdat = zone->zone_pgdat;
@@ -192,6 +193,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
writeback_set_ratelimit(); writeback_set_ratelimit();
return 0; return 0;
} }
#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
static pg_data_t *hotadd_new_pgdat(int nid, u64 start) static pg_data_t *hotadd_new_pgdat(int nid, u64 start)
{ {