diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 03:19:59 -0400 |
commit | bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa (patch) | |
tree | b02319e809c5b8abfca85409a11472775e27f597 /arch/arm/kernel/smp.c | |
parent | 06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 (diff) | |
parent | eb0474544bc16a9dab53b26abd846e86ba814eb1 (diff) |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
Diffstat (limited to 'arch/arm/kernel/smp.c')
-rw-r--r-- | arch/arm/kernel/smp.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 35417d0fb8ab..854ce33715f4 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -319,17 +319,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) | |||
319 | */ | 319 | */ |
320 | platform_secondary_init(cpu); | 320 | platform_secondary_init(cpu); |
321 | 321 | ||
322 | /* | ||
323 | * Enable local interrupts. | ||
324 | */ | ||
325 | notify_cpu_starting(cpu); | 322 | notify_cpu_starting(cpu); |
326 | local_irq_enable(); | ||
327 | local_fiq_enable(); | ||
328 | |||
329 | /* | ||
330 | * Setup the percpu timer for this CPU. | ||
331 | */ | ||
332 | percpu_timer_setup(); | ||
333 | 323 | ||
334 | calibrate_delay(); | 324 | calibrate_delay(); |
335 | 325 | ||
@@ -341,10 +331,23 @@ asmlinkage void __cpuinit secondary_start_kernel(void) | |||
341 | * before we continue. | 331 | * before we continue. |
342 | */ | 332 | */ |
343 | set_cpu_online(cpu, true); | 333 | set_cpu_online(cpu, true); |
334 | |||
335 | /* | ||
336 | * Setup the percpu timer for this CPU. | ||
337 | */ | ||
338 | percpu_timer_setup(); | ||
339 | |||
344 | while (!cpu_active(cpu)) | 340 | while (!cpu_active(cpu)) |
345 | cpu_relax(); | 341 | cpu_relax(); |
346 | 342 | ||
347 | /* | 343 | /* |
344 | * cpu_active bit is set, so it's safe to enalbe interrupts | ||
345 | * now. | ||
346 | */ | ||
347 | local_irq_enable(); | ||
348 | local_fiq_enable(); | ||
349 | |||
350 | /* | ||
348 | * OK, it's off to the idle thread for us | 351 | * OK, it's off to the idle thread for us |
349 | */ | 352 | */ |
350 | cpu_idle(); | 353 | cpu_idle(); |