summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatt Redfearn <matt.redfearn@imgtec.com>2016-07-07 09:50:40 +0200
committerRalf Baechle <ralf@linux-mips.org>2016-07-24 12:22:20 +0200
commit7840d6188b44d94a0a9a4d9e9e7108f8eef67de2 (patch)
tree5bb17288c4adc61b825e58c93912db1bb582776e /arch
parentMIPS: smp-cps: Add support for CPU hotplug of MIPSr6 processors (diff)
downloadlinux-7840d6188b44d94a0a9a4d9e9e7108f8eef67de2.tar.xz
linux-7840d6188b44d94a0a9a4d9e9e7108f8eef67de2.zip
MIPS: Move CPU Hotplug config option into submenu
The KConfig option HOTPLUG_CPU should appear in the "Kernel Type" submenu. Relocate it to where SMP support is configured. Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/13751/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Kconfig20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ab255ddd859a..99804f6a4af5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1110,16 +1110,6 @@ config NEED_DMA_MAP_STATE
config SYS_HAS_EARLY_PRINTK
bool
-config HOTPLUG_CPU
- bool "Support for hot-pluggable CPUs"
- depends on SMP && SYS_SUPPORTS_HOTPLUG_CPU
- help
- Say Y here to allow turning CPUs off and on. CPUs can be
- controlled through /sys/devices/system/cpu.
- (Note: power management support will enable this option
- automatically on SMP systems. )
- Say N if you want to disable CPU hotplug.
-
config SYS_SUPPORTS_HOTPLUG_CPU
bool
@@ -2633,6 +2623,16 @@ config SMP
If you don't know what to do here, say N.
+config HOTPLUG_CPU
+ bool "Support for hot-pluggable CPUs"
+ depends on SMP && SYS_SUPPORTS_HOTPLUG_CPU
+ help
+ Say Y here to allow turning CPUs off and on. CPUs can be
+ controlled through /sys/devices/system/cpu.
+ (Note: power management support will enable this option
+ automatically on SMP systems. )
+ Say N if you want to disable CPU hotplug.
+
config SMP_UP
bool