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

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

[PATCH] hot-add-mem x86_64: Kconfig changes 



Create Kconfig namespace for MEMORY_HOTPLUG_RESERVE and MEMORY_HOTPLUG_SPARSE.
 This is needed to create a disticiton between the 2 paths.  Selecting the
high level opiton of MEMORY_HOTPLUG will get you MEMORY_HOTPLUG_SPARSE if you
have sparsemem enabled or MEMORY_HOTPLUG_RESERVE if you are x86_64 with
discontig and ACPI numa support.

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 f28c5edc

arch/x86_64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -367,6 +367,10 @@ config ARCH_FLATMEM_ENABLE 


source "mm/Kconfig"



config MEMORY_HOTPLUG_RESERVE

	def_bool y

	depends on (MEMORY_HOTPLUG && DISCONTIGMEM)



config HAVE_ARCH_EARLY_PFN_TO_NID

	def_bool y

	depends on NUMA

mm/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -115,12 +115,17 @@ config SPARSEMEM_EXTREME 
# eventually, we can have this option just 'select SPARSEMEM'

config MEMORY_HOTPLUG

	bool "Allow for memory hot-add"

	depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG

	depends on SPARSEMEM || X86_64_ACPI_NUMA

	depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG

	depends on (IA64 || X86 || PPC64)



comment "Memory hotplug is currently incompatible with Software Suspend"

	depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND



config MEMORY_HOTPLUG_SPARSE

	def_bool y

	depends on SPARSEMEM && MEMORY_HOTPLUG



# Heavily threaded applications may benefit from splitting the mm-wide

# page_table_lock, so that faults on different parts of the user address

# space can be handled with less contention: split it at this NR_CPUS.