Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Yasunori Goto and committed by
Linus Torvalds
cc57637b 81b0c871

+12 -1
+3
arch/i386/Kconfig
··· 794 794 795 795 endmenu 796 796 797 + config ARCH_ENABLE_MEMORY_HOTPLUG 798 + def_bool y 799 + depends on HIGHMEM 797 800 798 801 menu "Power management options (ACPI, APM)" 799 802 depends on !X86_VOYAGER
+3
arch/ia64/Kconfig
··· 271 271 can be controlled through /sys/devices/system/cpu/cpu#. 272 272 Say N if you want to disable CPU hotplug. 273 273 274 + config ARCH_ENABLE_MEMORY_HOTPLUG 275 + def_bool y 276 + 274 277 config SCHED_SMT 275 278 bool "SMT scheduler support" 276 279 depends on SMP
+3
arch/powerpc/Kconfig
··· 618 618 619 619 Say N if you are unsure. 620 620 621 + config ARCH_ENABLE_MEMORY_HOTPLUG 622 + def_bool y 623 + 621 624 config KEXEC 622 625 bool "kexec system call (EXPERIMENTAL)" 623 626 depends on PPC_MULTIPLATFORM && EXPERIMENTAL
+2
arch/x86_64/Kconfig
··· 370 370 can be controlled through /sys/devices/system/cpu/cpu#. 371 371 Say N if you want to disable CPU hotplug. 372 372 373 + config ARCH_ENABLE_MEMORY_HOTPLUG 374 + def_bool y 373 375 374 376 config HPET_TIMER 375 377 bool
+1 -1
mm/Kconfig
··· 115 115 # eventually, we can have this option just 'select SPARSEMEM' 116 116 config MEMORY_HOTPLUG 117 117 bool "Allow for memory hot-add" 118 - depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND 118 + depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG 119 119 depends on (IA64 || X86 || PPC64) 120 120 121 121 comment "Memory hotplug is currently incompatible with Software Suspend"