Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[firefly-linux-kernel-4.4.55.git] / drivers / irqchip / irq-xtensa-mx.c

diff --git a/drivers/irqchip/irq-xtensa-mx.c b/drivers/irqchip/irq-xtensa-mx.c
index f693f1bc1348e1ca178add91c86cde036dda4d7b..e1c2f963289374b38a3a7bce93c930cb6565b376 100644 (file)
--- a/drivers/irqchip/irq-xtensa-mx.c
+++ b/drivers/irqchip/irq-xtensa-mx.c
@@ -122,7 +122,7 @@ static int xtensa_mx_irq_retrigger(struct irq_data *d)
 static int xtensa_mx_irq_set_affinity(struct irq_data *d,
                const struct cpumask *dest, bool force)
 {
-       unsigned mask = 1u << cpumask_any(dest);
+       unsigned mask = 1u << cpumask_any_and(dest, cpu_online_mask);
 
        set_er(mask, MIROUT(d->hwirq - HW_IRQ_MX_BASE));
        return 0;