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;