diff options
| author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-08-08 17:35:33 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-08-08 17:35:33 +0200 |
| commit | 5443cf44e9f256b5bd85b7ea621ccb179c4217d3 (patch) | |
| tree | aae51731cdfd10734028ed40e4463de7f68aece2 | |
| parent | d92165febdccd522e2a8b55008ffdb0ed121141a (diff) | |
memory hotplug: 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>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
| -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 | ||||
| -rw-r--r-- | mm/Kconfig | 2 |
5 files changed, 12 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 5b1a7d46d1d9..b50c1acca4da 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -751,6 +751,9 @@ config DOUBLEFAULT endmenu +config ARCH_ENABLE_MEMORY_HOTPLUG + def_bool y + depends on HIGHMEM menu "Power management options (ACPI, APM)" depends on !X86_VOYAGER diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index a85ea9d37f05..fb5d0c77d06d 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -262,6 +262,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 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index dfba81719dec..67b796cedefb 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -562,6 +562,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 diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index e18eb79bf855..5fc1f328212a 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -342,6 +342,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 diff --git a/mm/Kconfig b/mm/Kconfig index a9cb80ae6409..0873998d1496 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -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 comment "Memory hotplug is currently incompatible with Software Suspend" depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND |