diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-11 08:40:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-11 08:40:32 -0700 |
| commit | c529b7e2db948e240c48c54a83d0b6279275e57d (patch) | |
| tree | ae4e0f6f6cebd1f5821c1708d0dd0cae489f868d /arch/ia64/kernel/smpboot.c | |
| parent | e2858ce3ed519500e3b9af1c16c25250ff16cd5c (diff) | |
| parent | e7b140365b86aaf94374214c6f4e6decbee2eb0a (diff) | |
| download | blackbird-op-linux-c529b7e2db948e240c48c54a83d0b6279275e57d.tar.gz blackbird-op-linux-c529b7e2db948e240c48c54a83d0b6279275e57d.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] prevent ia64 from invoking irq handlers on offline CPUs
[IA64] arch/ia64/sn/pci/tioca_provider.c: introduce missing kfree
[IA64] fix up bte.h
[IA64] fix compile failure with non modular builds
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
| -rw-r--r-- | arch/ia64/kernel/smpboot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index bcea81e432fd..d8f05e504fbf 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c @@ -741,16 +741,14 @@ int __cpu_disable(void) return -EBUSY; } - cpu_clear(cpu, cpu_online_map); - if (migrate_platform_irqs(cpu)) { cpu_set(cpu, cpu_online_map); return (-EBUSY); } remove_siblinginfo(cpu); - cpu_clear(cpu, cpu_online_map); fixup_irqs(); + cpu_clear(cpu, cpu_online_map); local_flush_tlb_all(); cpu_clear(cpu, cpu_callin_map); return 0; |
