Commit 8b6b795d authored by Yury Norov's avatar Yury Norov
Browse files

lib/cpumask: change return types to unsigned where appropriate 



Switch return types to unsigned int where return values cannot be negative.

Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent cb32c285

include/linux/cpumask.h

+7 −7
Original line number Diff line number Diff line
@@ -176,12 +176,12 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node) 
	return 0;

}



static inline int cpumask_any_and_distribute(const struct cpumask *src1p,

static inline unsigned int cpumask_any_and_distribute(const struct cpumask *src1p,

					     const struct cpumask *src2p) {

	return cpumask_first_and(src1p, src2p);

}



static inline int cpumask_any_distribute(const struct cpumask *srcp)

static inline unsigned int cpumask_any_distribute(const struct cpumask *srcp)

{

	return cpumask_first(srcp);

}
@@ -258,12 +258,12 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp) 
	return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);

}



int __pure cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);

int __pure cpumask_any_but(const struct cpumask *mask, unsigned int cpu);

unsigned int __pure cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);

unsigned int __pure cpumask_any_but(const struct cpumask *mask, unsigned int cpu);

unsigned int cpumask_local_spread(unsigned int i, int node);

int cpumask_any_and_distribute(const struct cpumask *src1p,

unsigned int cpumask_any_and_distribute(const struct cpumask *src1p,

			       const struct cpumask *src2p);

int cpumask_any_distribute(const struct cpumask *srcp);

unsigned int cpumask_any_distribute(const struct cpumask *srcp);



/**

 * for_each_cpu - iterate over every cpu in a mask
@@ -289,7 +289,7 @@ int cpumask_any_distribute(const struct cpumask *srcp); 
		(cpu) = cpumask_next_zero((cpu), (mask)),	\

		(cpu) < nr_cpu_ids;)



extern int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap);

unsigned int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap);



/**

 * for_each_cpu_wrap - iterate over every cpu in a mask, starting at a specified location

lib/cpumask.c

+9 −9
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ EXPORT_SYMBOL(cpumask_next); 
 *

 * Returns >= nr_cpu_ids if no further cpus set in both.

 */

int cpumask_next_and(int n, const struct cpumask *src1p,

unsigned int cpumask_next_and(int n, const struct cpumask *src1p,

		     const struct cpumask *src2p)

{

	/* -1 is a legal arg here. */
@@ -50,7 +50,7 @@ EXPORT_SYMBOL(cpumask_next_and); 
 * Often used to find any cpu but smp_processor_id() in a mask.

 * Returns >= nr_cpu_ids if no cpus set.

 */

int cpumask_any_but(const struct cpumask *mask, unsigned int cpu)

unsigned int cpumask_any_but(const struct cpumask *mask, unsigned int cpu)

{

	unsigned int i;
@@ -74,9 +74,9 @@ EXPORT_SYMBOL(cpumask_any_but); 
 * Note: the @wrap argument is required for the start condition when

 * we cannot assume @start is set in @mask.

 */

int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap)

unsigned int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap)

{

	int next;

	unsigned int next;



again:

	next = cpumask_next(n, mask);
@@ -205,7 +205,7 @@ void __init free_bootmem_cpumask_var(cpumask_var_t mask) 
 */

unsigned int cpumask_local_spread(unsigned int i, int node)

{

	int cpu;

	unsigned int cpu;



	/* Wrap: we always want a cpu. */

	i %= num_online_cpus();
@@ -243,10 +243,10 @@ static DEFINE_PER_CPU(int, distribute_cpu_mask_prev); 
 *

 * Returns >= nr_cpu_ids if the intersection is empty.

 */

int cpumask_any_and_distribute(const struct cpumask *src1p,

unsigned int cpumask_any_and_distribute(const struct cpumask *src1p,

			       const struct cpumask *src2p)

{

	int next, prev;

	unsigned int next, prev;



	/* NOTE: our first selection will skip 0. */

	prev = __this_cpu_read(distribute_cpu_mask_prev);
@@ -262,9 +262,9 @@ int cpumask_any_and_distribute(const struct cpumask *src1p, 
}

EXPORT_SYMBOL(cpumask_any_and_distribute);



int cpumask_any_distribute(const struct cpumask *srcp)

unsigned int cpumask_any_distribute(const struct cpumask *srcp)

{

	int next, prev;

	unsigned int next, prev;



	/* NOTE: our first selection will skip 0. */

	prev = __this_cpu_read(distribute_cpu_mask_prev);