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

Commit cc57637b authored Jun 29, 2006 by Yasunori Goto Committed by Linus Torvalds Jun 29, 2006

[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: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 81b0c871

arch/i386/Kconfig

+3 −0

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

	endmenu		endmenu

			config ARCH_ENABLE_MEMORY_HOTPLUG
			def_bool y
			depends on HIGHMEM

	menu "Power management options (ACPI, APM)"		menu "Power management options (ACPI, APM)"
	depends on !X86_VOYAGER		depends on !X86_VOYAGER

arch/ia64/Kconfig

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -271,6 +271,9 @@ config HOTPLUG_CPU
	can be controlled through /sys/devices/system/cpu/cpu#.		can be controlled through /sys/devices/system/cpu/cpu#.
	Say N if you want to disable CPU hotplug.		Say N if you want to disable CPU hotplug.

			config ARCH_ENABLE_MEMORY_HOTPLUG
			def_bool y

	config SCHED_SMT		config SCHED_SMT
	bool "SMT scheduler support"		bool "SMT scheduler support"
	depends on SMP		depends on SMP

arch/powerpc/Kconfig

+3 −0

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

	Say N if you are unsure.		Say N if you are unsure.

			config ARCH_ENABLE_MEMORY_HOTPLUG
			def_bool y

	config KEXEC		config KEXEC
	bool "kexec system call (EXPERIMENTAL)"		bool "kexec system call (EXPERIMENTAL)"
	depends on PPC_MULTIPLATFORM && EXPERIMENTAL		depends on PPC_MULTIPLATFORM && EXPERIMENTAL

arch/x86_64/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -370,6 +370,8 @@ config HOTPLUG_CPU
	can be controlled through /sys/devices/system/cpu/cpu#.		can be controlled through /sys/devices/system/cpu/cpu#.
	Say N if you want to disable CPU hotplug.		Say N if you want to disable CPU hotplug.

			config ARCH_ENABLE_MEMORY_HOTPLUG
			def_bool y

	config HPET_TIMER		config HPET_TIMER
	bool		bool

mm/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME
	# eventually, we can have this option just 'select SPARSEMEM'		# eventually, we can have this option just 'select SPARSEMEM'
	config MEMORY_HOTPLUG		config MEMORY_HOTPLUG
	bool "Allow for memory hot-add"		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)		depends on (IA64 \|\| X86 \|\| PPC64)

	comment "Memory hotplug is currently incompatible with Software Suspend"		comment "Memory hotplug is currently incompatible with Software Suspend"