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.
  ...

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
index b9d9489a5012..9f417feaf6e8 100644
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -99,7 +99,7 @@ static inline int init_new_context(struct task_struct *tsk,
 {
         int i;
 
-        for (i = 0; i < num_online_cpus(); i++)
+        for_each_online_cpu(i)
                 cpu_context(i, mm) = NO_CONTEXT;
 
         return 0;
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index fc5acfc93c92..de6be008fc01 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -363,7 +363,7 @@ void flush_tlb_mm(struct mm_struct *mm)
                 smp_call_function(flush_tlb_mm_ipi, (void *)mm, 1);
         } else {
                 int i;
-                for (i = 0; i < num_online_cpus(); i++)
+                for_each_online_cpu(i)
                         if (smp_processor_id() != i)
                                 cpu_context(i, mm) = 0;
         }
@@ -400,7 +400,7 @@ void flush_tlb_range(struct vm_area_struct *vma,
                 smp_call_function(flush_tlb_range_ipi, (void *)&fd, 1);
         } else {
                 int i;
-                for (i = 0; i < num_online_cpus(); i++)
+                for_each_online_cpu(i)
                         if (smp_processor_id() != i)
                                 cpu_context(i, mm) = 0;
         }
@@ -443,7 +443,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
                 smp_call_function(flush_tlb_page_ipi, (void *)&fd, 1);
         } else {
                 int i;
-                for (i = 0; i < num_online_cpus(); i++)
+                for_each_online_cpu(i)
                         if (smp_processor_id() != i)
                                 cpu_context(i, vma->vm_mm) = 0;
         }