1 files changed, 6 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 5b22b07c8f67..7b96e5a270ce 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -178,7 +178,7 @@ static int get_irq_server(unsigned int virq, const struct cpumask *cpumask,
         if (!distribute_irqs)
                 return default_server;
 
-        if (!cpumask_equal(cpumask, cpu_all_mask)) {
+        if (!cpumask_subset(cpu_possible_mask, cpumask)) {
                 int server = cpumask_first_and(cpu_online_mask, cpumask);
 
                 if (server < nr_cpu_ids)
@@ -243,7 +243,7 @@ static unsigned int xics_startup(unsigned int virq)
          * at that level, so we do it here by hand.
          */
         if (irq_to_desc(virq)->msi_desc)
-                unmask_msi_irq(virq);
+                unmask_msi_irq(irq_get_irq_data(virq));
 
         /* unmask it */
         xics_unmask_irq(virq);
@@ -928,8 +928,10 @@ void xics_migrate_irqs_away(void)
                 if (xics_status[0] != hw_cpu)
                         goto unlock;
 
-                printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
-                       virq, cpu);
+                /* This is expected during cpu offline. */
+                if (cpu_online(cpu))
+                        printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
+                               virq, cpu);
 
                 /* Reset affinity to all cpus */
                 cpumask_setall(irq_to_desc(virq)->affinity);