Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 11463994a7d5..52290547c85b 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -736,14 +736,15 @@ 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);
+                return -EBUSY;
         }
 
         remove_siblinginfo(cpu);
         fixup_irqs();
-        cpu_clear(cpu, cpu_online_map);
         local_flush_tlb_all();
         cpu_clear(cpu, cpu_callin_map);
         return 0;