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

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
...@@ -176,12 +176,12 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node) ...@@ -176,12 +176,12 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node)
return 0; 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) { const struct cpumask *src2p) {
return cpumask_first_and(src1p, 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); return cpumask_first(srcp);
} }
...@@ -258,12 +258,12 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *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); 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 *); unsigned 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_any_but(const struct cpumask *mask, unsigned int cpu);
unsigned int cpumask_local_spread(unsigned int i, int node); 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); 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 * for_each_cpu - iterate over every cpu in a mask
...@@ -289,7 +289,7 @@ int cpumask_any_distribute(const struct cpumask *srcp); ...@@ -289,7 +289,7 @@ int cpumask_any_distribute(const struct cpumask *srcp);
(cpu) = cpumask_next_zero((cpu), (mask)), \ (cpu) = cpumask_next_zero((cpu), (mask)), \
(cpu) < nr_cpu_ids;) (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 * for_each_cpu_wrap - iterate over every cpu in a mask, starting at a specified location
......
...@@ -31,7 +31,7 @@ EXPORT_SYMBOL(cpumask_next); ...@@ -31,7 +31,7 @@ EXPORT_SYMBOL(cpumask_next);
* *
* Returns >= nr_cpu_ids if no further cpus set in both. * 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) const struct cpumask *src2p)
{ {
/* -1 is a legal arg here. */ /* -1 is a legal arg here. */
...@@ -50,7 +50,7 @@ EXPORT_SYMBOL(cpumask_next_and); ...@@ -50,7 +50,7 @@ EXPORT_SYMBOL(cpumask_next_and);
* Often used to find any cpu but smp_processor_id() in a mask. * Often used to find any cpu but smp_processor_id() in a mask.
* Returns >= nr_cpu_ids if no cpus set. * 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; unsigned int i;
...@@ -74,9 +74,9 @@ EXPORT_SYMBOL(cpumask_any_but); ...@@ -74,9 +74,9 @@ EXPORT_SYMBOL(cpumask_any_but);
* Note: the @wrap argument is required for the start condition when * Note: the @wrap argument is required for the start condition when
* we cannot assume @start is set in @mask. * 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: again:
next = cpumask_next(n, mask); next = cpumask_next(n, mask);
...@@ -205,7 +205,7 @@ void __init free_bootmem_cpumask_var(cpumask_var_t 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) unsigned int cpumask_local_spread(unsigned int i, int node)
{ {
int cpu; unsigned int cpu;
/* Wrap: we always want a cpu. */ /* Wrap: we always want a cpu. */
i %= num_online_cpus(); i %= num_online_cpus();
...@@ -243,10 +243,10 @@ static DEFINE_PER_CPU(int, distribute_cpu_mask_prev); ...@@ -243,10 +243,10 @@ static DEFINE_PER_CPU(int, distribute_cpu_mask_prev);
* *
* Returns >= nr_cpu_ids if the intersection is empty. * 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) const struct cpumask *src2p)
{ {
int next, prev; unsigned int next, prev;
/* NOTE: our first selection will skip 0. */ /* NOTE: our first selection will skip 0. */
prev = __this_cpu_read(distribute_cpu_mask_prev); prev = __this_cpu_read(distribute_cpu_mask_prev);
...@@ -262,9 +262,9 @@ int cpumask_any_and_distribute(const struct cpumask *src1p, ...@@ -262,9 +262,9 @@ int cpumask_any_and_distribute(const struct cpumask *src1p,
} }
EXPORT_SYMBOL(cpumask_any_and_distribute); 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. */ /* NOTE: our first selection will skip 0. */
prev = __this_cpu_read(distribute_cpu_mask_prev); prev = __this_cpu_read(distribute_cpu_mask_prev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment