lib/cpumask: move trivial wrappers around find_bit to the header

[linux-2.6-block.git] / lib / cpumask.c

diff --git a/lib/cpumask.c b/lib/cpumask.c
index da68f6bbde44342ffbfde4d26220490d442bb3d2..cb7262ff863340a914ddf999885c29b4d0e13fbc 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -7,61 +7,6 @@
 #include <linux/memblock.h>
 #include <linux/numa.h>
 
-/**
- * cpumask_next - get the next cpu in a cpumask
- * @n: the cpu prior to the place to search (ie. return will be > @n)
- * @srcp: the cpumask pointer
- *
- * Returns >= nr_cpu_ids if no further cpus set.
- */
-unsigned int cpumask_next(int n, const struct cpumask *srcp)
-{
-       /* -1 is a legal arg here. */
-       if (n != -1)
-               cpumask_check(n);
-       return find_next_bit(cpumask_bits(srcp), nr_cpumask_bits, n + 1);
-}
-EXPORT_SYMBOL(cpumask_next);
-
-/**
- * cpumask_next_and - get the next cpu in *src1p & *src2p
- * @n: the cpu prior to the place to search (ie. return will be > @n)
- * @src1p: the first cpumask pointer
- * @src2p: the second cpumask pointer
- *
- * Returns >= nr_cpu_ids if no further cpus set in both.
- */
-unsigned int cpumask_next_and(int n, const struct cpumask *src1p,
-                    const struct cpumask *src2p)
-{
-       /* -1 is a legal arg here. */
-       if (n != -1)
-               cpumask_check(n);
-       return find_next_and_bit(cpumask_bits(src1p), cpumask_bits(src2p),
-               nr_cpumask_bits, n + 1);
-}
-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.
- */
-unsigned 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