diff options
author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-06-29 05:24:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 13:26:20 -0400 |
commit | cc57637b0b015fb5d70dbbec740de516d33af07d (patch) | |
tree | eafbfdf6e058194b46f0fe8dcb0e0c5de5b6fd6d /arch | |
parent | 81b0c8713385ce1b1b9058e916edcf9561ad76d6 (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/Kconfig | 3 | ||||
-rw-r--r-- | arch/ia64/Kconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 3 | ||||
-rw-r--r-- | arch/x86_64/Kconfig | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 3bb221db164a..5fa3c671c937 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -794,6 +794,9 @@ config COMPAT_VDSO | |||
794 | 794 | ||
795 | endmenu | 795 | endmenu |
796 | 796 | ||
797 | config ARCH_ENABLE_MEMORY_HOTPLUG | ||
798 | def_bool y | ||
799 | depends on HIGHMEM | ||
797 | 800 | ||
798 | menu "Power management options (ACPI, APM)" | 801 | menu "Power management options (ACPI, APM)" |
799 | depends on !X86_VOYAGER | 802 | depends on !X86_VOYAGER |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index a56df7bf022d..5faacbb8d16c 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -271,6 +271,9 @@ config HOTPLUG_CPU | |||
271 | can be controlled through /sys/devices/system/cpu/cpu#. | 271 | can be controlled through /sys/devices/system/cpu/cpu#. |
272 | Say N if you want to disable CPU hotplug. | 272 | Say N if you want to disable CPU hotplug. |
273 | 273 | ||
274 | config ARCH_ENABLE_MEMORY_HOTPLUG | ||
275 | def_bool y | ||
276 | |||
274 | config SCHED_SMT | 277 | config SCHED_SMT |
275 | bool "SMT scheduler support" | 278 | bool "SMT scheduler support" |
276 | depends on SMP | 279 | depends on SMP |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e922a88b2bad..e2e9df344ab7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -618,6 +618,9 @@ config HOTPLUG_CPU | |||
618 | 618 | ||
619 | Say N if you are unsure. | 619 | Say N if you are unsure. |
620 | 620 | ||
621 | config ARCH_ENABLE_MEMORY_HOTPLUG | ||
622 | def_bool y | ||
623 | |||
621 | config KEXEC | 624 | config KEXEC |
622 | bool "kexec system call (EXPERIMENTAL)" | 625 | bool "kexec system call (EXPERIMENTAL)" |
623 | depends on PPC_MULTIPLATFORM && EXPERIMENTAL | 626 | depends on PPC_MULTIPLATFORM && EXPERIMENTAL |
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index ccc4a7fb97a3..91039844820c 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
@@ -370,6 +370,8 @@ config HOTPLUG_CPU | |||
370 | can be controlled through /sys/devices/system/cpu/cpu#. | 370 | can be controlled through /sys/devices/system/cpu/cpu#. |
371 | Say N if you want to disable CPU hotplug. | 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 | config HPET_TIMER | 376 | config HPET_TIMER |
375 | bool | 377 | bool |