Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53947027 authored by Keith Mannthey's avatar Keith Mannthey Committed by Linus Torvalds
Browse files

[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: default avatarKeith Mannthey <kmannth@us.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8c2676a5

drivers/base/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ obj-y += power/ 
obj-$(CONFIG_ISA)	+= isa.o

obj-$(CONFIG_FW_LOADER)	+= firmware_class.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_SYS_HYPERVISOR) += hypervisor.o

include/linux/memory.h

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct memory_block { 
struct notifier_block;

struct mem_section;



#ifndef CONFIG_MEMORY_HOTPLUG

#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE

static inline int memory_dev_init(void)

{

	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)





#endif /* CONFIG_MEMORY_HOTPLUG */

#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */



#define hotplug_memory_notifier(fn, pri) {			\

	static struct notifier_block fn##_mem_nb =		\

mm/memory_hotplug.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <asm/tlbflush.h>



#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE

static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)

{

	struct pglist_data *pgdat = zone->zone_pgdat;
@@ -192,6 +193,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages) 
	writeback_set_ratelimit();

	return 0;

}

#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */



static pg_data_t *hotadd_new_pgdat(int nid, u64 start)

{