1 files changed, 7 insertions, 0 deletions

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 298dd745651e..490db85dec23 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -693,6 +693,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         smp_store_cpu_info(smp_processor_id());
 
         /*
+         * If UP is mandated by "nosmp" (which implies "maxcpus=0"), don't set
+         * secondary CPUs present.
+         */
+        if (max_cpus == 0)
+                return;
+
+        /*
          * Initialise the present map (which describes the set of CPUs
          * actually populated at the present time) and release the
          * secondaries from the bootloader.