cpumask: deprecate any_online_cpu() in favour of cpumask_any/cpumask_any_both

any_online_cpu() is a good name, but it takes a cpumask_t, not a
pointer.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 include/linux/cpumask.h |   10 ++++++----
 lib/cpumask.c           |   12 ------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff -r d7093048340a include/linux/cpumask.h
--- a/include/linux/cpumask.h	Wed Oct 01 12:28:08 2008 +1000
+++ b/include/linux/cpumask.h	Wed Oct 01 12:28:26 2008 +1000
@@ -108,7 +108,8 @@
  * int cpu_possible(cpu)		Is some cpu possible?
  * int cpu_present(cpu)			Is some cpu present (can schedule)?
  *
- * int any_online_cpu(mask)		First online cpu in mask
+ * int cpumask_any(mask)		Any cpu in mask
+ * int cpumask_any_both(mask1,mask2)	Any cpu in both masks
  *
  * for_each_possible_cpu(cpu)		for-loop cpu over cpu_possible_map
  * for_each_online_cpu(cpu)		for-loop cpu over cpu_online_map
@@ -179,6 +180,7 @@ extern cpumask_t _unused_cpumask_arg_;
 #define for_each_cpu_mask(cpu, mask)	for_each_cpu(cpu, &(mask))
 #define first_cpu(src)		cpumask_first(&(src))
 #define next_cpu(n, src)	cpumask_next((n), &(src))
+#define any_online_cpu(mask)	cpumask_first_both(&(mask), &cpu_online_map)
 /* End deprecated region. */
 
 #if NR_CPUS <= BITS_PER_LONG
@@ -356,6 +358,9 @@ static inline void cpumask_copy(struct c
 	memcpy(dstp, srcp, BITS_TO_LONGS(nr_cpu_ids) * sizeof(long));
 }
 
+#define cpumask_any(srcp) cpumask_first(srcp)
+#define cpumask_any_both(mask1, mask2) cpumask_first_both((mask1), (mask2))
+
 /*
  * Special-case data structure for "single bit set only" constant CPU masks.
  *
@@ -419,7 +424,6 @@ extern const struct cpumask cpu_mask_all
 #define cpumask_next(n, src)	({ (void)(src); 1; })
 #define cpumask_first_both(src1, src2)	({ (void)(src1); (void)(src2); 0; })
 #define cpumask_next(n, src1, src2)	({ (void)(src1); (void)(src2); 1; })
-#define any_online_cpu(mask)	0
 #define for_each_cpu(cpu, mask)	\
 	for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
 #define for_each_cpu_both(cpu, mask1, mask2) \
@@ -431,9 +435,7 @@ int cpumask_next(int n, const cpumask_t 
 int cpumask_next(int n, const cpumask_t *srcp);
 int cpumask_first_both(const cpumask_t *src1, const cpumask_t *src2);
 int cpumask_next_both(int n, const cpumask_t *src1, const cpumask_t *src2);
-int __any_online_cpu(const cpumask_t *mask);
 
-#define any_online_cpu(mask) __any_online_cpu(&(mask))
 #define for_each_cpu(cpu, mask)				\
 	for ((cpu) = cpumask_first(mask);		\
 	     (cpu) < nr_cpu_ids;			\
diff -r d7093048340a lib/cpumask.c
--- a/lib/cpumask.c	Wed Oct 01 12:28:08 2008 +1000
+++ b/lib/cpumask.c	Wed Oct 01 12:28:26 2008 +1000
@@ -35,18 +35,6 @@ int cpumask_next_both(int n, const cpuma
 }
 EXPORT_SYMBOL(cpumask_next_both);
 
-int __any_online_cpu(const cpumask_t *mask)
-{
-	int cpu;
-
-	for_each_cpu(cpu, mask) {
-		if (cpu_online(cpu))
-			break;
-	}
-	return cpu;
-}
-EXPORT_SYMBOL(__any_online_cpu);
-
 /* These are not inline because of header tangles. */
 #ifdef CONFIG_CPUMASK_OFFSTACK
 bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)