diff options
Diffstat (limited to 'arch/mips/netlogic/common/smp.c')
-rw-r--r-- | arch/mips/netlogic/common/smp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c index 1f66eef3aea7..885d293b61da 100644 --- a/arch/mips/netlogic/common/smp.c +++ b/arch/mips/netlogic/common/smp.c | |||
@@ -145,7 +145,6 @@ void nlm_cpus_done(void) | |||
145 | * Boot all other cpus in the system, initialize them, and bring them into | 145 | * Boot all other cpus in the system, initialize them, and bring them into |
146 | * the boot function | 146 | * the boot function |
147 | */ | 147 | */ |
148 | int nlm_cpu_ready[NR_CPUS]; | ||
149 | unsigned long nlm_next_gp; | 148 | unsigned long nlm_next_gp; |
150 | unsigned long nlm_next_sp; | 149 | unsigned long nlm_next_sp; |
151 | static cpumask_t phys_cpu_present_mask; | 150 | static cpumask_t phys_cpu_present_mask; |
@@ -168,6 +167,7 @@ void __init nlm_smp_setup(void) | |||
168 | { | 167 | { |
169 | unsigned int boot_cpu; | 168 | unsigned int boot_cpu; |
170 | int num_cpus, i, ncore; | 169 | int num_cpus, i, ncore; |
170 | volatile u32 *cpu_ready = nlm_get_boot_data(BOOT_CPU_READY); | ||
171 | char buf[64]; | 171 | char buf[64]; |
172 | 172 | ||
173 | boot_cpu = hard_smp_processor_id(); | 173 | boot_cpu = hard_smp_processor_id(); |
@@ -181,10 +181,10 @@ void __init nlm_smp_setup(void) | |||
181 | num_cpus = 1; | 181 | num_cpus = 1; |
182 | for (i = 0; i < NR_CPUS; i++) { | 182 | for (i = 0; i < NR_CPUS; i++) { |
183 | /* | 183 | /* |
184 | * nlm_cpu_ready array is not set for the boot_cpu, | 184 | * cpu_ready array is not set for the boot_cpu, |
185 | * it is only set for ASPs (see smpboot.S) | 185 | * it is only set for ASPs (see smpboot.S) |
186 | */ | 186 | */ |
187 | if (nlm_cpu_ready[i]) { | 187 | if (cpu_ready[i]) { |
188 | cpumask_set_cpu(i, &phys_cpu_present_mask); | 188 | cpumask_set_cpu(i, &phys_cpu_present_mask); |
189 | __cpu_number_map[i] = num_cpus; | 189 | __cpu_number_map[i] = num_cpus; |
190 | __cpu_logical_map[num_cpus] = i; | 190 | __cpu_logical_map[num_cpus] = i; |