Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 53947027ad90542ddb2bb746e3175827c270610a

Authored by Keith Mannthey
Committed by Linus Torvalds
1 parent 8c2676a587

[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>

Showing 3 changed files with 5 additions and 3 deletions Side-by-side Diff

drivers/base/Makefile
Diff comments   View file @ 5394702
... ... @@ -8,7 +8,7 @@
8 8 obj-$(CONFIG_ISA) += isa.o
9 9 obj-$(CONFIG_FW_LOADER) += firmware_class.o
10 10 obj-$(CONFIG_NUMA) += node.o
11   -obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o
  11 +obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
12 12 obj-$(CONFIG_SMP) += topology.o
13 13 obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
14 14  
include/linux/memory.h
Diff comments   View file @ 5394702
... ... @@ -57,7 +57,7 @@
57 57 struct notifier_block;
58 58 struct mem_section;
59 59  
60   -#ifndef CONFIG_MEMORY_HOTPLUG
  60 +#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE
61 61 static inline int memory_dev_init(void)
62 62 {
63 63 return 0;
... ... @@ -78,7 +78,7 @@
78 78 #define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT)
79 79  
80 80  
81   -#endif /* CONFIG_MEMORY_HOTPLUG */
  81 +#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
82 82  
83 83 #define hotplug_memory_notifier(fn, pri) { \
84 84 static struct notifier_block fn##_mem_nb = \
... ... @@ -26,6 +26,7 @@
26 26  
27 27 #include <asm/tlbflush.h>
28 28  
  29 +#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
29 30 static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)
30 31 {
31 32 struct pglist_data *pgdat = zone->zone_pgdat;
... ... @@ -192,6 +193,7 @@
192 193 writeback_set_ratelimit();
193 194 return 0;
194 195 }
  196 +#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
195 197  
196 198 static pg_data_t *hotadd_new_pgdat(int nid, u64 start)
197 199 {