From 41636606ea0d7e61c4dc221bbaef25b945ceb880 Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Mon, 9 Feb 2009 11:16:16 -0700
Subject: [PATCH] --- yaml --- r: 131567 b: refs/heads/master c:
 66db2e6331612bbec193a358885854330596a92a h: refs/heads/master i:   131565:
 996e02944ebb75ab9e5bb42d3a39b33d7c2579f6   131563:
 f393676451a7ba68f8ef0c534ed53e415b39ea77   131559:
 cff6cfd725891c6ba28e02bb5414d4fbbe389513   131551:
 19a904de4b34f7dc403d8284f5c5ad0b53db6f8c v: v3

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

diff --git a/[refs] b/[refs]
index 3de43661354c..283b10a3e1dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39d481cba27809598e755e184bc0d8ae1d22423e
+refs/heads/master: 66db2e6331612bbec193a358885854330596a92a
diff --git a/trunk/arch/ia64/kernel/smpboot.c b/trunk/arch/ia64/kernel/smpboot.c
index 11463994a7d5..2ec5bbff461e 100644
--- a/trunk/arch/ia64/kernel/smpboot.c
+++ b/trunk/arch/ia64/kernel/smpboot.c
@@ -736,14 +736,16 @@ 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);
-	fixup_irqs();
 	cpu_clear(cpu, cpu_online_map);
+	fixup_irqs();
 	local_flush_tlb_all();
 	cpu_clear(cpu, cpu_callin_map);
 	return 0;