diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
| commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
| tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/mips/netlogic/xlr/smp.c | |
| parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
| parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
| download | linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz | |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/mips/netlogic/xlr/smp.c')
| -rw-r--r-- | arch/mips/netlogic/xlr/smp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/netlogic/xlr/smp.c b/arch/mips/netlogic/xlr/smp.c index d842bce5c940..080284ded508 100644 --- a/arch/mips/netlogic/xlr/smp.c +++ b/arch/mips/netlogic/xlr/smp.c @@ -158,6 +158,10 @@ void __init nlm_smp_setup(void) num_cpus = 1; for (i = 0; i < NR_CPUS; i++) { + /* + * BSP is not set in nlm_cpu_ready array, it is only for + * ASPs (goto see smpboot.S) + */ if (nlm_cpu_ready[i]) { cpu_set(i, phys_cpu_present_map); __cpu_number_map[i] = num_cpus; @@ -191,7 +195,7 @@ struct plat_smp_ops nlm_smp_ops = { unsigned long secondary_entry_point; -int nlm_wakeup_secondary_cpus(u32 wakeup_mask) +int __cpuinit nlm_wakeup_secondary_cpus(u32 wakeup_mask) { unsigned int tid, pid, ipi, i, boot_cpu; void *reset_vec; |