1 files changed, 7 insertions, 3 deletions

diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index 81b1d311834f..8fca6807cab8 100644
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -57,8 +57,9 @@ struct psb_info nlm_prom_info;
 unsigned long nlm_common_ebase = 0x0;
 
 /* default to uniprocessor */
-uint32_t nlm_coremask = 1, nlm_cpumask  = 1;
+uint32_t nlm_coremask = 1;
 int  nlm_threads_per_core = 1;
+cpumask_t nlm_cpumask = CPU_MASK_CPU0;
 
 static void __init nlm_early_serial_setup(void)
 {
@@ -178,7 +179,7 @@ static void prom_add_memory(void)
 
 void __init prom_init(void)
 {
-        int *argv, *envp;               /* passed as 32 bit ptrs */
+        int i, *argv, *envp;            /* passed as 32 bit ptrs */
         struct psb_info *prom_infop;
 
         /* truncate to 32 bit and sign extend all args */
@@ -195,7 +196,10 @@ void __init prom_init(void)
         prom_add_memory();
 
 #ifdef CONFIG_SMP
-        nlm_wakeup_secondary_cpus(nlm_prom_info.online_cpu_map);
+        for (i = 0; i < 32; i++)
+                if (nlm_prom_info.online_cpu_map & (1 << i))
+                        cpumask_set_cpu(i, &nlm_cpumask);
+        nlm_wakeup_secondary_cpus();
         register_smp_ops(&nlm_smp_ops);
 #endif
 }