2 files changed, 7 insertions, 10 deletions

diff --git a/arch/ia64/include/asm/irq.h b/arch/ia64/include/asm/irq.h
index 36429a532630..5282546cdf82 100644
--- a/arch/ia64/include/asm/irq.h
+++ b/arch/ia64/include/asm/irq.h
@@ -27,7 +27,7 @@ irq_canonicalize (int irq)
 }
 
 extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
-bool is_affinity_mask_valid(cpumask_var_t cpumask);
+bool is_affinity_mask_valid(const struct cpumask *cpumask);
 
 #define is_affinity_mask_valid is_affinity_mask_valid
 
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 95ff16cb05d8..a58f64ca9f0e 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -102,17 +102,14 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };
 
 void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
 {
-        cpumask_t mask = CPU_MASK_NONE;
-
-        cpu_set(cpu_logical_id(hwid), mask);
-
         if (irq < NR_IRQS) {
-                irq_desc[irq].affinity = mask;
+                cpumask_copy(&irq_desc[irq].affinity,
+                             cpumask_of(cpu_logical_id(hwid)));
                 irq_redir[irq] = (char) (redir & 0xff);
         }
 }
 
-bool is_affinity_mask_valid(cpumask_var_t cpumask)
+bool is_affinity_mask_valid(const struct cpumask *cpumask)
 {
         if (ia64_platform_is("sn2")) {
                 /* Only allow one CPU to be specified in the smp_affinity mask */
@@ -128,7 +125,7 @@ bool is_affinity_mask_valid(cpumask_var_t cpumask)
 unsigned int vectors_in_migration[NR_IRQS];
 
 /*
- * Since cpu_online_map is already updated, we just need to check for
+ * Since cpu_online_mask is already updated, we just need to check for
  * affinity that has zeros
  */
 static void migrate_irqs(void)
@@ -158,7 +155,7 @@ static void migrate_irqs(void)
                          */
                         vectors_in_migration[irq] = irq;
 
-                        new_cpu = any_online_cpu(cpu_online_map);
+                        new_cpu = cpumask_any(cpu_online_mask);
 
                         /*
                          * Al three are essential, currently WARN_ON.. maybe panic?
@@ -191,7 +188,7 @@ void fixup_irqs(void)
          * Find a new timesync master
          */
         if (smp_processor_id() == time_keeper_id) {
-                time_keeper_id = first_cpu(cpu_online_map);
+                time_keeper_id = cpumask_first(cpu_online_mask);
                 printk ("CPU %d is now promoted to time-keeper master\n", time_keeper_id);
         }