cpumask: deprecate any_online_cpu() in favour of cpumask_any/cpumask_any_and any_online_cpu() is a good name, but it takes a cpumask_t, not a pointer. From: Rusty Russell Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- include/linux/cpumask.h | 11 ++++++----- lib/cpumask.c | 12 ------------ 2 files changed, 6 insertions(+), 17 deletions(-) diff -r 891717d75d43 include/linux/cpumask.h --- a/include/linux/cpumask.h Wed Oct 22 11:08:17 2008 +1100 +++ b/include/linux/cpumask.h Wed Oct 22 11:08:24 2008 +1100 @@ -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_and(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 @@ -184,6 +185,7 @@ extern cpumask_t _unused_cpumask_arg_; for_each_cpu_and(cpu, &(mask), &(and)) #define first_cpu(src) cpumask_first(&(src)) #define next_cpu(n, src) cpumask_next((n), &(src)) +#define any_online_cpu(mask) cpumask_any_and(&(mask), &cpu_online_map) /* End deprecated region. */ #if NR_CPUS > 1 @@ -384,6 +386,9 @@ static inline void cpumask_copy(struct c bitmap_copy(cpumask_bits(dstp), cpumask_bits(srcp), nr_cpumask_bits); } +#define cpumask_any(srcp) cpumask_first(srcp) +#define cpumask_any_and(mask1, mask2) cpumask_first_and((mask1), (mask2)) + /* * Special-case data structure for "single bit set only" constant CPU masks. * @@ -450,7 +455,6 @@ extern cpumask_t cpu_mask_all; #define cpumask_first(src) ({ (void)(src); 0; }) #define cpumask_next(n, src) ({ (void)(src); 1; }) #define cpumask_next_and(n, srcp, andp) ({ (void)(srcp), (void)(andp); 1; }) -#define any_online_cpu(mask) 0 #define for_each_cpu(cpu, mask) \ for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask) @@ -462,9 +466,6 @@ int cpumask_first(const cpumask_t *srcp) int cpumask_first(const cpumask_t *srcp); int cpumask_next(int n, const cpumask_t *srcp); int cpumask_next_and(int n, const cpumask_t *srcp, const cpumask_t *andp); -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) = -1; \ diff -r 891717d75d43 lib/cpumask.c --- a/lib/cpumask.c Wed Oct 22 11:08:17 2008 +1100 +++ b/lib/cpumask.c Wed Oct 22 11:08:24 2008 +1100 @@ -23,18 +23,6 @@ int cpumask_next_and(int n, const cpumas return n; } EXPORT_SYMBOL(cpumask_next_and); - -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