[PATCH 3/4] cpumask: Convert cpumask_any_but() to the new random function

[Qais Yousef]

cpumask_any() and cpumask_any_and() are now truly, move the
cpumask_any_but() to behave in a similar manner.

Signed-off-by: Qais Yousef <qais.yousef@xxxxxxx>
CC: Juri Lelli <juri.lelli@xxxxxxxxxx>
CC: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
CC: Dietmar Eggemann <dietmar.eggemann@xxxxxxx>
CC: Steven Rostedt <rostedt@xxxxxxxxxxx>
CC: Ben Segall <bsegall@xxxxxxxxxx>
CC: Mel Gorman <mgorman@xxxxxxx>
CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Yury Norov <yury.norov@xxxxxxxxx>
CC: Paul Turner <pjt@xxxxxxxxxx>
CC: Alexey Dobriyan <adobriyan@xxxxxxxxx>
CC: Josh Don <joshdon@xxxxxxxxxx>
CC: Pavan Kondeti <pkondeti@xxxxxxxxxxxxxx>
CC: linux-kernel@xxxxxxxxxxxxxxx
---
 include/linux/cpumask.h |  2 +-
 lib/cpumask.c           | 44 ++++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 7fb25d256043..f04e983e9dd0 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -254,10 +254,10 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
 }
 
 int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
-int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
 unsigned int cpumask_local_spread(unsigned int i, int node);
 int cpumask_any(const struct cpumask *srcp);
 int cpumask_any_and(const struct cpumask *src1p, const struct cpumask *src2p);
+int cpumask_any_but(const struct cpumask *srcp, unsigned int cpu);
 
 /**
  * for_each_cpu - iterate over every cpu in a mask
diff --git a/lib/cpumask.c b/lib/cpumask.c
index bcac63e45374..0295cf5486ab 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -42,26 +42,6 @@ int cpumask_next_and(int n, const struct cpumask *src1p,
 }
 EXPORT_SYMBOL(cpumask_next_and);
 
-/**
- * cpumask_any_but - return a "random" in a cpumask, but not this one.
- * @mask: the cpumask to search
- * @cpu: the cpu to ignore.
- *
- * Often used to find any cpu but smp_processor_id() in a mask.
- * Returns >= nr_cpu_ids if no cpus set.
- */
-int cpumask_any_but(const struct cpumask *mask, unsigned int cpu)
-{
-	unsigned int i;
-
-	cpumask_check(cpu);
-	for_each_cpu(i, mask)
-		if (i != cpu)
-			break;
-	return i;
-}
-EXPORT_SYMBOL(cpumask_any_but);
-
 /**
  * cpumask_next_wrap - helper to implement for_each_cpu_wrap
  * @n: the cpu prior to the place to search
@@ -283,3 +263,27 @@ int cpumask_any(const struct cpumask *srcp)
 	return next;
 }
 EXPORT_SYMBOL(cpumask_any);
+
+/**
+ * cpumask_any_but - return a "random" in a cpumask, but not this one.
+ * @srcp: the cpumask to search
+ * @cpu: the cpu to ignore.
+ *
+ * Often used to find any cpu but smp_processor_id() in a mask.
+ * Returns >= nr_cpu_ids if no cpus set.
+ */
+int cpumask_any_but(const struct cpumask *srcp, unsigned int cpu)
+{
+	unsigned int i;
+
+	cpumask_check(cpu);
+
+	for_each_cpu(i, srcp) {
+		i = cpumask_any(srcp);
+		if (i != cpu)
+			return i;
+	}
+
+	return nr_cpu_ids;
+}
+EXPORT_SYMBOL(cpumask_any_but);
-- 
2.17.1