Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / lib / cpumask.c

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 1ea2c18..5f97dc2 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -15,8 +15,14 @@ int __next_cpu(int n, const cpumask_t *srcp)
 }
 EXPORT_SYMBOL(__next_cpu);
 
-int nr_cpu_ids;
-EXPORT_SYMBOL(nr_cpu_ids);
+#if NR_CPUS > 64
+int __next_cpu_nr(int n, const cpumask_t *srcp)
+{
+       return min_t(int, nr_cpu_ids,
+                               find_next_bit(srcp->bits, nr_cpu_ids, n+1));
+}
+EXPORT_SYMBOL(__next_cpu_nr);
+#endif
 
 int __any_online_cpu(const cpumask_t *mask)
 {