Merge tag 'xfs-for-linus-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / irqchip / irq-mips-gic.c

diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index bc48b7dc89ec6a978d3bb4eaebcd3f663403e1c8..57f09cb544644bcd97aa81bfc044c2686b350bbb 100644 (file)
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -389,19 +389,19 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
        int             i;
 
        cpumask_and(&tmp, cpumask, cpu_online_mask);
-       if (cpus_empty(tmp))
+       if (cpumask_empty(&tmp))
                return -EINVAL;
 
        /* Assumption : cpumask refers to a single CPU */
        spin_lock_irqsave(&gic_lock, flags);
 
        /* Re-route this IRQ */
-       gic_map_to_vpe(irq, first_cpu(tmp));
+       gic_map_to_vpe(irq, cpumask_first(&tmp));
 
        /* Update the pcpu_masks */
        for (i = 0; i < NR_CPUS; i++)
                clear_bit(irq, pcpu_masks[i].pcpu_mask);
-       set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask);
+       set_bit(irq, pcpu_masks[cpumask_first(&tmp)].pcpu_mask);
 
        cpumask_copy(d->affinity, cpumask);
        spin_unlock_irqrestore(&gic_lock, flags);