From: Alex Chiang <achiang@hp.com>
Date: Mon, 9 Feb 2009 18:16:57 +0000 (-0700)
Subject: [IA64] Remove redundant cpu_clear() in __cpu_disable path
X-Git-Tag: v2.6.29-rc6~34^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c0acdea21437eff134cc3486bdc52907d9086af1;p=~shefty%2Frdma-dev.git

[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)>
---

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 2ec5bbff461..52290547c85 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);