From b6a0bc9e50ff1eff4e412c403b8c17d51af7f20b Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Mon, 9 Feb 2009 11:16:57 -0700
Subject: [PATCH] --- yaml --- r: 131568 b: refs/heads/master c:
 c0acdea21437eff134cc3486bdc52907d9086af1 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/smpboot.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 283b10a3e1dc..478d360c62c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66db2e6331612bbec193a358885854330596a92a
+refs/heads/master: c0acdea21437eff134cc3486bdc52907d9086af1
diff --git a/trunk/arch/ia64/kernel/smpboot.c b/trunk/arch/ia64/kernel/smpboot.c
index 2ec5bbff461e..52290547c85b 100644
--- a/trunk/arch/ia64/kernel/smpboot.c
+++ b/trunk/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);