diff options
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
-rw-r--r-- | arch/i386/kernel/smpboot.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 6cdd941fc2f2..48bfcaa13ecc 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c | |||
@@ -287,9 +287,7 @@ static void __cpuinit smp_callin(void) | |||
287 | /* | 287 | /* |
288 | * Save our processor parameters | 288 | * Save our processor parameters |
289 | */ | 289 | */ |
290 | smp_store_cpu_info(cpuid); | 290 | smp_store_cpu_info(cpuid); |
291 | |||
292 | disable_APIC_timer(); | ||
293 | 291 | ||
294 | /* | 292 | /* |
295 | * Allow the master to continue. | 293 | * Allow the master to continue. |
@@ -408,7 +406,6 @@ static void __cpuinit start_secondary(void *unused) | |||
408 | enable_NMI_through_LVT0(NULL); | 406 | enable_NMI_through_LVT0(NULL); |
409 | enable_8259A_irq(0); | 407 | enable_8259A_irq(0); |
410 | } | 408 | } |
411 | enable_APIC_timer(); | ||
412 | /* | 409 | /* |
413 | * low-memory mappings have been cleared, flush them from | 410 | * low-memory mappings have been cleared, flush them from |
414 | * the local TLBs too. | 411 | * the local TLBs too. |