From 8a6530f5c8982e555a9be11c3241a8a3fe45eff4 Mon Sep 17 00:00:00 2001
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Date: Wed, 28 Mar 2012 14:42:46 -0700
Subject: [PATCH] --- yaml --- r: 297271 b: refs/heads/master c:
 38b93780a5381961ad92d24ab9a12a964189a3a4 h: refs/heads/master i:   297269:
 15a8327aeaa47daa716736a0e154e02ec3d48d25   297267:
 c76262c3eb7ea731dd81f055993a33a849e62c9a   297263:
 abbc3a0e7e2c5e017e20c61df520d18474ff4b3d v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/cpumask.h |  3 +--
 trunk/lib/cpumask.c           | 12 ------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 411f27993fd2..98701a53a904 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74046494ea68676d29ef6501a4bd950f08112a2c
+refs/heads/master: 38b93780a5381961ad92d24ab9a12a964189a3a4
diff --git a/trunk/include/linux/cpumask.h b/trunk/include/linux/cpumask.h
index 7b9b75a529be..1ffdb9856bb9 100644
--- a/trunk/include/linux/cpumask.h
+++ b/trunk/include/linux/cpumask.h
@@ -810,11 +810,10 @@ static inline const struct cpumask *get_cpu_mask(unsigned int cpu)
 #else /* NR_CPUS > 1 */
 int __first_cpu(const cpumask_t *srcp);
 int __next_cpu(int n, const cpumask_t *srcp);
-int __any_online_cpu(const cpumask_t *mask);
 
 #define first_cpu(src)		__first_cpu(&(src))
 #define next_cpu(n, src)	__next_cpu((n), &(src))
-#define any_online_cpu(mask) __any_online_cpu(&(mask))
+#define any_online_cpu(mask) cpumask_any_and(&mask, cpu_online_mask)
 #define for_each_cpu_mask(cpu, mask)			\
 	for ((cpu) = -1;				\
 		(cpu) = next_cpu((cpu), (mask)),	\
diff --git a/trunk/lib/cpumask.c b/trunk/lib/cpumask.c
index 0b660118ed91..402a54ac35cb 100644
--- a/trunk/lib/cpumask.c
+++ b/trunk/lib/cpumask.c
@@ -26,18 +26,6 @@ int __next_cpu_nr(int n, const cpumask_t *srcp)
 EXPORT_SYMBOL(__next_cpu_nr);
 #endif
 
-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);
-
 /**
  * cpumask_next_and - get the next cpu in *src1p & *src2p
  * @n: the cpu prior to the place to search (ie. return will be > @n)