Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull final removal of deprecated cpus_* cpumask functions from Rusty Russell:
 "This is the final removal (after several years!) of the obsolete
  cpus_* functions, prompted by their mis-use in staging.

  With these function removed, all cpu functions should only iterate to
  nr_cpu_ids, so we finally only allocate that many bits when cpumasks
  are allocated offstack"

* tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (25 commits)
  cpumask: remove __first_cpu / __next_cpu
  cpumask: resurrect CPU_MASK_CPU0
  linux/cpumask.h: add typechecking to cpumask_test_cpu
  cpumask: only allocate nr_cpumask_bits.
  Fix weird uses of num_online_cpus().
  cpumask: remove deprecated functions.
  mips: fix obsolete cpumask_of_cpu usage.
  x86: fix more deprecated cpu function usage.
  ia64: remove deprecated cpus_ usage.
  powerpc: fix deprecated CPU_MASK_CPU0 usage.
  CPU_MASK_ALL/CPU_MASK_NONE: remove from deprecated region.
  staging/lustre/o2iblnd: Don't use cpus_weight
  staging/lustre/libcfs: replace deprecated cpus_ calls with cpumask_
  staging/lustre/ptlrpc: Do not use deprecated cpus_* functions
  blackfin: fix up obsolete cpu function usage.
  parisc: fix up obsolete cpu function usage.
  tile: fix up obsolete cpu function usage.
  arm64: fix up obsolete cpu function usage.
  mips: fix up obsolete cpu function usage.
  x86: fix up obsolete cpu function usage.
  ...

7 files changed, 15 insertions, 16 deletions

diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index f3656a6b0382..35a88097af3c 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -117,7 +117,8 @@ static void apbt_set_mode(enum clock_event_mode mode,
         unsigned long period;
         struct dw_apb_clock_event_device *dw_ced = ced_to_dw_apb_ced(evt);
 
-        pr_debug("%s CPU %d mode=%d\n", __func__, first_cpu(*evt->cpumask),
+        pr_debug("%s CPU %d mode=%d\n", __func__,
+                 cpumask_first(evt->cpumask),
                  mode);
 
         switch (mode) {
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
index 73fe2f8d7f96..7936dce4b878 100644
--- a/drivers/cpuidle/coupled.c
+++ b/drivers/cpuidle/coupled.c
@@ -292,7 +292,7 @@ static inline int cpuidle_coupled_get_state(struct cpuidle_device *dev,
          */
         smp_rmb();
 
-        for_each_cpu_mask(i, coupled->coupled_cpus)
+        for_each_cpu(i, &coupled->coupled_cpus)
                 if (cpu_online(i) && coupled->requested_state[i] < state)
                         state = coupled->requested_state[i];
 
@@ -338,7 +338,7 @@ static void cpuidle_coupled_poke_others(int this_cpu,
 {
         int cpu;
 
-        for_each_cpu_mask(cpu, coupled->coupled_cpus)
+        for_each_cpu(cpu, &coupled->coupled_cpus)
                 if (cpu != this_cpu && cpu_online(cpu))
                         cpuidle_coupled_poke(cpu);
 }
@@ -638,7 +638,7 @@ int cpuidle_coupled_register_device(struct cpuidle_device *dev)
         if (cpumask_empty(&dev->coupled_cpus))
                 return 0;
 
-        for_each_cpu_mask(cpu, dev->coupled_cpus) {
+        for_each_cpu(cpu, &dev->coupled_cpus) {
                 other_dev = per_cpu(cpuidle_devices, cpu);
                 if (other_dev && other_dev->coupled) {
                         coupled = other_dev->coupled;
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index afd136b45f49..10a9aeff1666 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -1754,7 +1754,7 @@ static int spu_mdesc_walk_arcs(struct mdesc_handle *mdesc,
                                 dev->dev.of_node->full_name);
                         return -EINVAL;
                 }
-                cpu_set(*id, p->sharing);
+                cpumask_set_cpu(*id, &p->sharing);
                 table[*id] = p;
         }
         return 0;
@@ -1776,7 +1776,7 @@ static int handle_exec_unit(struct spu_mdesc_info *ip, struct list_head *list,
                 return -ENOMEM;
         }
 
-        cpus_clear(p->sharing);
+        cpumask_clear(&p->sharing);
         spin_lock_init(&p->lock);
         p->q_type = q_type;
         INIT_LIST_HEAD(&p->jobs);
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 4f2fb62e6f37..49875adb6b44 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -567,7 +567,7 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
          */
         smp_wmb();
 
-        for_each_cpu_mask(cpu, *mask) {
+        for_each_cpu(cpu, mask) {
                 u64 cluster_id = cpu_logical_map(cpu) & ~0xffUL;
                 u16 tlist;
 
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index bc48b7dc89ec..57f09cb54464 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -389,19 +389,19 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
         int             i;
 
         cpumask_and(&tmp, cpumask, cpu_online_mask);
-        if (cpus_empty(tmp))
+        if (cpumask_empty(&tmp))
                 return -EINVAL;
 
         /* Assumption : cpumask refers to a single CPU */
         spin_lock_irqsave(&gic_lock, flags);
 
         /* Re-route this IRQ */
-        gic_map_to_vpe(irq, first_cpu(tmp));
+        gic_map_to_vpe(irq, cpumask_first(&tmp));
 
         /* Update the pcpu_masks */
         for (i = 0; i < NR_CPUS; i++)
                 clear_bit(irq, pcpu_masks[i].pcpu_mask);
-        set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask);
+        set_bit(irq, pcpu_masks[cpumask_first(&tmp)].pcpu_mask);
 
         cpumask_copy(d->affinity, cpumask);
         spin_unlock_irqrestore(&gic_lock, flags);
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index a789a2054388..a3f7610002aa 100644
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -1123,7 +1123,7 @@ static int alloc_percpu_mpipe_resources(struct net_device *dev,
                         addr + i * sizeof(struct tile_net_comps);
 
         /* If this is a network cpu, create an iqueue. */
-        if (cpu_isset(cpu, network_cpus_map)) {
+        if (cpumask_test_cpu(cpu, &network_cpus_map)) {
                 order = get_order(NOTIF_RING_SIZE);
                 page = homecache_alloc_pages(GFP_KERNEL, order, cpu);
                 if (page == NULL) {
@@ -1299,7 +1299,7 @@ static int tile_net_init_mpipe(struct net_device *dev)
         int first_ring, ring;
         int instance = mpipe_instance(dev);
         struct mpipe_data *md = &mpipe_data[instance];
-        int network_cpus_count = cpus_weight(network_cpus_map);
+        int network_cpus_count = cpumask_weight(&network_cpus_map);
 
         if (!hash_default) {
                 netdev_err(dev, "Networking requires hash_default!\n");
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a1cfbd3dda47..8eab107b53fb 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6632,14 +6632,12 @@ static void fail_all_outstanding_cmds(struct ctlr_info *h)
 
 static void set_lockup_detected_for_all_cpus(struct ctlr_info *h, u32 value)
 {
-        int i, cpu;
+        int cpu;
 
-        cpu = cpumask_first(cpu_online_mask);
-        for (i = 0; i < num_online_cpus(); i++) {
+        for_each_online_cpu(cpu) {
                 u32 *lockup_detected;
                 lockup_detected = per_cpu_ptr(h->lockup_detected, cpu);
                 *lockup_detected = value;
-                cpu = cpumask_next(cpu, cpu_online_mask);
         }
         wmb(); /* be sure the per-cpu variables are out to memory */
 }