2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 7beffcab2745..9dedbbd218c3 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -704,16 +704,17 @@ static unsigned int iosapic_startup_irq(unsigned int irq)
 }
 
 #ifdef CONFIG_SMP
-static void iosapic_set_affinity_irq(unsigned int irq, cpumask_t dest)
+static void iosapic_set_affinity_irq(unsigned int irq,
+                                     const struct cpumask *dest)
 {
         struct vector_info *vi = iosapic_get_vector(irq);
         u32 d0, d1, dummy_d0;
         unsigned long flags;
 
-        if (cpu_check_affinity(irq, &dest))
+        if (cpu_check_affinity(irq, dest))
                 return;
 
-        vi->txn_addr = txn_affinity_addr(irq, first_cpu(dest));
+        vi->txn_addr = txn_affinity_addr(irq, cpumask_first(dest));
 
         spin_lock_irqsave(&iosapic_lock, flags);
         /* d1 contains the destination CPU, so only want to set that
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 1e3b934a4cf7..eba5ec5b020e 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -579,7 +579,7 @@ void rebind_evtchn_irq(int evtchn, int irq)
         spin_unlock(&irq_mapping_update_lock);
 
         /* new event channels are always bound to cpu 0 */
-        irq_set_affinity(irq, cpumask_of_cpu(0));
+        irq_set_affinity(irq, cpumask_of(0));
 
         /* Unmask the event channel. */
         enable_irq(irq);
@@ -608,9 +608,9 @@ static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
 }
 
 
-static void set_affinity_irq(unsigned irq, cpumask_t dest)
+static void set_affinity_irq(unsigned irq, const struct cpumask *dest)
 {
-        unsigned tcpu = first_cpu(dest);
+        unsigned tcpu = cpumask_first(dest);
         rebind_irq_to_cpu(irq, tcpu);
 }