diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
| commit | d22a8ccff761c81f2930bd90fa5712e51a0e9a62 (patch) | |
| tree | 52a92cf1b9a65e4440276706c4b4e879d4008a87 /arch/i386/kernel/smpboot.c | |
| parent | 783e3385a134305d49d7b431df6e591265e7ec14 (diff) | |
| parent | 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index d16520da4550..9ed449af8e9f 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c | |||
| @@ -1338,8 +1338,7 @@ int __cpu_disable(void) | |||
| 1338 | if (cpu == 0) | 1338 | if (cpu == 0) |
| 1339 | return -EBUSY; | 1339 | return -EBUSY; |
| 1340 | 1340 | ||
| 1341 | /* We enable the timer again on the exit path of the death loop */ | 1341 | clear_local_APIC(); |
| 1342 | disable_APIC_timer(); | ||
| 1343 | /* Allow any queued timer interrupts to get serviced */ | 1342 | /* Allow any queued timer interrupts to get serviced */ |
| 1344 | local_irq_enable(); | 1343 | local_irq_enable(); |
| 1345 | mdelay(1); | 1344 | mdelay(1); |