Commit cc57637b authored by Yasunori Goto's avatar Yasunori Goto Committed by Linus Torvalds
Browse files

[PATCH] solve config broken: undefined reference to `online_page' 



Memory hotplug code of i386 adds memory to only highmem.  So, if
CONFIG_HIGHMEM is not set, CONFIG_MEMORY_HOTPLUG shouldn't be set.
Otherwise, it causes compile error.

In addition, many architecture can't use memory hotplug feature yet.  So, I
introduce CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG.

Signed-off-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 81b0c871

arch/i386/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -794,6 +794,9 @@ config COMPAT_VDSO 


endmenu



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y

	depends on HIGHMEM



menu "Power management options (ACPI, APM)"

	depends on !X86_VOYAGER

arch/ia64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -271,6 +271,9 @@ config HOTPLUG_CPU 
	  can be controlled through /sys/devices/system/cpu/cpu#.

	  Say N if you want to disable CPU hotplug.



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y



config SCHED_SMT

	bool "SMT scheduler support"

	depends on SMP

arch/powerpc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -618,6 +618,9 @@ config HOTPLUG_CPU 


	  Say N if you are unsure.



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y



config KEXEC

	bool "kexec system call (EXPERIMENTAL)"

	depends on PPC_MULTIPLATFORM && EXPERIMENTAL

arch/x86_64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -370,6 +370,8 @@ config HOTPLUG_CPU 
		can be controlled through /sys/devices/system/cpu/cpu#.

		Say N if you want to disable CPU hotplug.



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y



config HPET_TIMER

	bool

mm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 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

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

	depends on (IA64 || X86 || PPC64)



comment "Memory hotplug is currently incompatible with Software Suspend"

CRA Git | Maintained and supported by SUSTech CRA and CCSE