1 files changed, 2 insertions, 3 deletions

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index bcea81e432fd..1dcbb85fc4ee 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -401,6 +401,7 @@ smp_callin (void)
         spin_lock(&vector_lock);
         /* Setup the per cpu irq handling data structures */
         __setup_vector_irq(cpuid);
+        notify_cpu_starting(cpuid);
         cpu_set(cpuid, cpu_online_map);
         per_cpu(cpu_state, cpuid) = CPU_ONLINE;
         spin_unlock(&vector_lock);
@@ -741,16 +742,14 @@ 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);
-        cpu_clear(cpu, cpu_online_map);
         fixup_irqs();
+        cpu_clear(cpu, cpu_online_map);
         local_flush_tlb_all();
         cpu_clear(cpu, cpu_callin_map);
         return 0;