Thanks to spatch.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
        desc = irq_to_desc(irq);
        cpumask_copy(&dest, desc->irq_data.affinity);
        if (irqd_is_per_cpu(&desc->irq_data) &&
-           !cpu_isset(smp_processor_id(), dest)) {
-               int cpu = first_cpu(dest);
+           !cpumask_test_cpu(smp_processor_id(), &dest)) {
+               int cpu = cpumask_first(&dest);
 
                printk(KERN_DEBUG "redirecting irq %d from CPU %d to %d\n",
                       irq, smp_processor_id(), cpu);