1 files changed, 5 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 1bccd4a56b57..c95697912fea 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -208,9 +208,6 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check)
         cpumask_t cpumask = irq_desc[virq].affinity;
         cpumask_t tmp = CPU_MASK_NONE;
 
-        if (! cpu_isset(default_server, cpu_online_map))
-                xics_update_irq_servers();
-
         if (!distribute_irqs)
                 return default_server;
 
@@ -685,8 +682,8 @@ void __init xics_init_IRQ(void)
         if (found == 0)
                 return;
 
-        xics_init_host();
         xics_update_irq_servers();
+        xics_init_host();
 
         if (firmware_has_feature(FW_FEATURE_LPAR))
                 ppc_md.get_irq = xics_get_irq_lpar;
@@ -779,6 +776,10 @@ void xics_migrate_irqs_away(void)
         int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();
         unsigned int irq, virq;
 
+        /* If we used to be the default server, move to the new "boot_cpuid" */
+        if (hw_cpu == default_server)
+                xics_update_irq_servers();
+
         /* Reject any interrupt that was queued to us... */
         xics_set_cpu_priority(0);