3 files changed, 5 insertions, 11 deletions

diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index fb2f1e622877..c430f9198d1b 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -17,12 +17,9 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,
 {
         struct msi_msg msg;
         u32 addr, data;
-        int cpu = first_cpu(*cpu_mask);
+        int cpu = cpumask_first_and(cpu_mask, cpu_online_mask);
         unsigned int irq = idata->irq;
 
-        if (!cpu_online(cpu))
-                return -1;
-
         if (irq_prepare_move(irq, cpu))
                 return -1;
 
@@ -139,10 +136,7 @@ static int dmar_msi_set_affinity(struct irq_data *data,
         unsigned int irq = data->irq;
         struct irq_cfg *cfg = irq_cfg + irq;
         struct msi_msg msg;
-        int cpu = cpumask_first(mask);
-
-        if (!cpu_online(cpu))
-                return -1;
+        int cpu = cpumask_first_and(mask, cpu_online_mask);
 
         if (irq_prepare_move(irq, cpu))
                 return -1;
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 62cf4dde6a04..85d095154902 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -209,8 +209,8 @@ static int sn_set_affinity_irq(struct irq_data *data,
         nasid_t nasid;
         int slice;
 
-        nasid = cpuid_to_nasid(cpumask_first(mask));
-        slice = cpuid_to_slice(cpumask_first(mask));
+        nasid = cpuid_to_nasid(cpumask_first_and(mask, cpu_online_mask));
+        slice = cpuid_to_slice(cpumask_first_and(mask, cpu_online_mask));
 
         list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe,
                                  sn_irq_lh[irq], list)
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index 2b98b9e088de..afc58d2799ad 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -166,7 +166,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,
         struct sn_pcibus_provider *provider;
         unsigned int cpu, irq = data->irq;
 
-        cpu = cpumask_first(cpu_mask);
+        cpu = cpumask_first_and(cpu_mask, cpu_online_mask);
         sn_irq_info = sn_msi_info[irq].sn_irq_info;
         if (sn_irq_info == NULL || sn_irq_info->irq_int_bit >= 0)
                 return -1;