diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 06:11:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 06:11:51 -0400 |
commit | 54b41b97fd07842d8b64963d538003c5f756ca12 (patch) | |
tree | eb70c7c0dee9e237018c3fda0b5566d6d1338a3b /arch/sh/Kconfig | |
parent | e60692b9347d17774cdad00ae2b9afd3dc5444af (diff) | |
parent | e7dc951eecb708d4aef18db4dbf489ba282d16ff (diff) |
Merge branch 'sh/smp'
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r-- | arch/sh/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index ba86bfba95ac..d73bd4db5e84 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -706,6 +706,13 @@ config NR_CPUS | |||
706 | This is purely to save memory - each supported CPU adds | 706 | This is purely to save memory - each supported CPU adds |
707 | approximately eight kilobytes to the kernel image. | 707 | approximately eight kilobytes to the kernel image. |
708 | 708 | ||
709 | config HOTPLUG_CPU | ||
710 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | ||
711 | depends on SMP && HOTPLUG && EXPERIMENTAL | ||
712 | help | ||
713 | Say Y here to experiment with turning CPUs off and on. CPUs | ||
714 | can be controlled through /sys/devices/system/cpu. | ||
715 | |||
709 | source "kernel/Kconfig.preempt" | 716 | source "kernel/Kconfig.preempt" |
710 | 717 | ||
711 | config GUSA | 718 | config GUSA |