summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2009-02-09 11:16:57 -0700
committerTony Luck <aegl@agluck-desktop.(none)>2009-02-19 11:32:50 -0800
commitc0acdea21437eff134cc3486bdc52907d9086af1 (patch)
tree08ad15f5c5acc26e2420cc6f46afceb487a9fa0b
parent66db2e6331612bbec193a358885854330596a92a (diff)
downloadop-kernel-dev-c0acdea21437eff134cc3486bdc52907d9086af1.zip
op-kernel-dev-c0acdea21437eff134cc3486bdc52907d9086af1.tar.gz
[IA64] Remove redundant cpu_clear() in __cpu_disable path
The second call to cpu_clear() is redundant, as we've already removed the CPU from cpu_online_map before calling migrate_platform_irqs(). Signed-off-by: Alex Chiang <achiang@hp.com> Signed-off-by: Tony Luck <aegl@agluck-desktop.(none)>
-rw-r--r--arch/ia64/kernel/smpboot.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 2ec5bbf..5229054 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -740,11 +740,10 @@ int __cpu_disable(void)
if (migrate_platform_irqs(cpu)) {
cpu_set(cpu, cpu_online_map);
- return (-EBUSY);
+ return -EBUSY;
}
remove_siblinginfo(cpu);
- cpu_clear(cpu, cpu_online_map);
fixup_irqs();
local_flush_tlb_all();
cpu_clear(cpu, cpu_callin_map);
OpenPOWER on IntegriCloud