diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2014-06-28 00:59:51 +0300 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2014-08-02 00:06:42 +0200 |
| commit | 5ca0e377a649149d717569bfd53e236d474e1331 (patch) | |
| tree | 434c3c69ce5c3782c0a6a4e6dd4134c017c9c3d2 /arch/mips/cavium-octeon/smp.c | |
| parent | MIPS: OCTEON: watchdog: don't jump to bootloader without entry address (diff) | |
| download | linux-dev-5ca0e377a649149d717569bfd53e236d474e1331.tar.xz linux-dev-5ca0e377a649149d717569bfd53e236d474e1331.zip | |
MIPS: OCTEON: support disabling HOTPLUG_CPU run-time
If nosmp kernel option given, we can assume HOTPLUG_CPU is disabled.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7202/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon/smp.c')
| -rw-r--r-- | arch/mips/cavium-octeon/smp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index 2c8d156f240c..ea969309b35f 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c @@ -84,6 +84,9 @@ static void octeon_smp_hotplug_setup(void) #ifdef CONFIG_HOTPLUG_CPU struct linux_app_boot_info *labi; + if (!setup_max_cpus) + return; + labi = (struct linux_app_boot_info *)PHYS_TO_XKSEG_CACHED(LABI_ADDR_IN_BOOTLOADER); if (labi->labi_signature != LABI_SIGNATURE) panic("The bootloader version on this board is incorrect."); @@ -129,7 +132,7 @@ static void octeon_smp_setup(void) * will assign CPU numbers for possible cores as well. Cores * are always consecutively numberd from 0. */ - for (id = 0; id < num_cores && id < NR_CPUS; id++) { + for (id = 0; setup_max_cpus && id < num_cores && id < NR_CPUS; id++) { if (!(core_mask & (1 << id))) { set_cpu_possible(cpus, true); __cpu_number_map[id] = cpus; |