diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/x86/kernel/smpboot.c | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 565ebc65920e..324f2a44c221 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -1250,16 +1250,7 @@ static void __ref remove_cpu_from_maps(int cpu) | |||
| 1250 | void cpu_disable_common(void) | 1250 | void cpu_disable_common(void) |
| 1251 | { | 1251 | { |
| 1252 | int cpu = smp_processor_id(); | 1252 | int cpu = smp_processor_id(); |
| 1253 | /* | ||
| 1254 | * HACK: | ||
| 1255 | * Allow any queued timer interrupts to get serviced | ||
| 1256 | * This is only a temporary solution until we cleanup | ||
| 1257 | * fixup_irqs as we do for IA64. | ||
| 1258 | */ | ||
| 1259 | local_irq_enable(); | ||
| 1260 | mdelay(1); | ||
| 1261 | 1253 | ||
| 1262 | local_irq_disable(); | ||
| 1263 | remove_siblinginfo(cpu); | 1254 | remove_siblinginfo(cpu); |
| 1264 | 1255 | ||
| 1265 | /* It's now safe to remove this processor from the online map */ | 1256 | /* It's now safe to remove this processor from the online map */ |