Skip to content

Commit be59924

Browse files
svanheuleYuryNorov
authored andcommitted
cpumask: align signatures of UP implementations
Between the generic version, and their uniprocessor optimised implementations, the return types of cpumask_any_and_distribute() and cpumask_any_distribute() are not identical. Change the UP versions to 'unsigned int', to match the generic versions. Suggested-by: Yury Norov <[email protected]> Signed-off-by: Sander Vanheule <[email protected]> Signed-off-by: Yury Norov <[email protected]>
1 parent 568035b commit be59924

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

include/linux/cpumask.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,13 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node)
202202
return 0;
203203
}
204204

205-
static inline int cpumask_any_and_distribute(const struct cpumask *src1p,
206-
const struct cpumask *src2p) {
205+
static inline unsigned int cpumask_any_and_distribute(const struct cpumask *src1p,
206+
const struct cpumask *src2p)
207+
{
207208
return cpumask_first_and(src1p, src2p);
208209
}
209210

210-
static inline int cpumask_any_distribute(const struct cpumask *srcp)
211+
static inline unsigned int cpumask_any_distribute(const struct cpumask *srcp)
211212
{
212213
return cpumask_first(srcp);
213214
}

0 commit comments

Comments
 (0)