diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /arch/sparc/kernel/sun4m_smp.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/sparc/kernel/sun4m_smp.c')
| -rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 3b32096134aa..7d4a649138f6 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
| @@ -39,7 +39,6 @@ extern ctxd_t *srmmu_ctx_table_phys; | |||
| 39 | 39 | ||
| 40 | extern void calibrate_delay(void); | 40 | extern void calibrate_delay(void); |
| 41 | 41 | ||
| 42 | extern volatile int smp_processors_ready; | ||
| 43 | extern volatile unsigned long cpu_callin_map[NR_CPUS]; | 42 | extern volatile unsigned long cpu_callin_map[NR_CPUS]; |
| 44 | extern unsigned char boot_cpu_id; | 43 | extern unsigned char boot_cpu_id; |
| 45 | 44 | ||
| @@ -217,7 +216,6 @@ void __init smp4m_smp_done(void) | |||
| 217 | } | 216 | } |
| 218 | 217 | ||
| 219 | /* Ok, they are spinning and ready to go. */ | 218 | /* Ok, they are spinning and ready to go. */ |
| 220 | smp_processors_ready = 1; | ||
| 221 | } | 219 | } |
| 222 | 220 | ||
| 223 | /* At each hardware IRQ, we get this called to forward IRQ reception | 221 | /* At each hardware IRQ, we get this called to forward IRQ reception |