diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /arch/i386/kernel/smpboot.c | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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); |