2 files changed, 12 insertions, 13 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 757035ea246f..3128a5090dbd 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -659,12 +659,12 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
 
         WARN_ON_ONCE(!in_interrupt());
         if (ehca_debug_level >= 3)
-                ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+                ehca_dmp(cpu_online_mask, cpumask_size(), "");
 
         spin_lock_irqsave(&pool->last_cpu_lock, flags);
-        cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+        cpu = cpumask_next(pool->last_cpu, cpu_online_mask);
         if (cpu >= nr_cpu_ids)
-                cpu = first_cpu(cpu_online_map);
+                cpu = cpumask_first(cpu_online_mask);
         pool->last_cpu = cpu;
         spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
 
@@ -855,7 +855,7 @@ static int __cpuinit comp_pool_callback(struct notifier_block *nfb,
         case CPU_UP_CANCELED_FROZEN:
                 ehca_gen_dbg("CPU: %x (CPU_CANCELED)", cpu);
                 cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu);
-                kthread_bind(cct->task, any_online_cpu(cpu_online_map));
+                kthread_bind(cct->task, cpumask_any(cpu_online_mask));
                 destroy_comp_task(pool, cpu);
                 break;
         case CPU_ONLINE:
@@ -902,7 +902,7 @@ int ehca_create_comp_pool(void)
                 return -ENOMEM;
 
         spin_lock_init(&pool->last_cpu_lock);
-        pool->last_cpu = any_online_cpu(cpu_online_map);
+        pool->last_cpu = cpumask_any(cpu_online_mask);
 
         pool->cpu_comp_tasks = alloc_percpu(struct ehca_cpu_comp_task);
         if (pool->cpu_comp_tasks == NULL) {
@@ -934,10 +934,9 @@ void ehca_destroy_comp_pool(void)
 
         unregister_hotcpu_notifier(&comp_pool_callback_nb);
 
-        for (i = 0; i < NR_CPUS; i++) {
-                if (cpu_online(i))
-                        destroy_comp_task(pool, i);
-        }
+        for_each_online_cpu(i)
+                destroy_comp_task(pool, i);
+
         free_percpu(pool->cpu_comp_tasks);
         kfree(pool);
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 239d4e8068ac..23173982b32c 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1679,7 +1679,7 @@ static int find_best_unit(struct file *fp,
          * InfiniPath chip to that processor (we assume reasonable connectivity,
          * for now).  This code assumes that if affinity has been set
          * before this point, that at most one cpu is set; for now this
-         * is reasonable.  I check for both cpus_empty() and cpus_full(),
+         * is reasonable.  I check for both cpumask_empty() and cpumask_full(),
          * in case some kernel variant sets none of the bits when no
          * affinity is set.  2.6.11 and 12 kernels have all present
          * cpus set.  Some day we'll have to fix it up further to handle
@@ -1688,11 +1688,11 @@ static int find_best_unit(struct file *fp,
          * information.  There may be some issues with dual core numbering
          * as well.  This needs more work prior to release.
          */
-        if (!cpus_empty(current->cpus_allowed) &&
-            !cpus_full(current->cpus_allowed)) {
+        if (!cpumask_empty(&current->cpus_allowed) &&
+            !cpumask_full(&current->cpus_allowed)) {
                 int ncpus = num_online_cpus(), curcpu = -1, nset = 0;
                 for (i = 0; i < ncpus; i++)
-                        if (cpu_isset(i, current->cpus_allowed)) {
+                        if (cpumask_test_cpu(i, &current->cpus_allowed)) {
                                 ipath_cdbg(PROC, "%s[%u] affinity set for "
                                            "cpu %d/%d\n", current->comm,
                                            current->pid, i, ncpus);