Merge commit 'e26a9e0' into stable/for-linus-3.15

[karo-tx-linux.git] / arch / mips / sibyte / bcm1480 / irq.c

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 09d6e16a70f14f0b294f99a4b193862cfde8dcca..59cfe2659771e058bf08823c8b6b83fa22a44fa7 100644 (file)
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -95,7 +95,7 @@ static int bcm1480_set_affinity(struct irq_data *d, const struct cpumask *mask,
        u64 cur_ints;
        unsigned long flags;
 
-       i = cpumask_first(mask);
+       i = cpumask_first_and(mask, cpu_online_mask);
 
        /* Convert logical CPU to physical CPU */
        cpu = cpu_logical_map(i);