Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5ac1f55 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

linux/cpumask.h: update bitmap wrappers to take unsigned int 



Since the various bitmap_* functions now take an unsigned int as nbits
parameter, it makes sense to also update the various wrappers, even though
they're marked as obsolete.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 33c4fa8c

include/linux/cpumask.h

+11 −11
Original line number Diff line number Diff line
@@ -905,13 +905,13 @@ static inline void __cpu_clear(int cpu, volatile cpumask_t *dstp) 
}



#define cpus_setall(dst) __cpus_setall(&(dst), NR_CPUS)

static inline void __cpus_setall(cpumask_t *dstp, int nbits)

static inline void __cpus_setall(cpumask_t *dstp, unsigned int nbits)

{

	bitmap_fill(dstp->bits, nbits);

}



#define cpus_clear(dst) __cpus_clear(&(dst), NR_CPUS)

static inline void __cpus_clear(cpumask_t *dstp, int nbits)

static inline void __cpus_clear(cpumask_t *dstp, unsigned int nbits)

{

	bitmap_zero(dstp->bits, nbits);

}
@@ -927,21 +927,21 @@ static inline int __cpu_test_and_set(int cpu, cpumask_t *addr) 


#define cpus_and(dst, src1, src2) __cpus_and(&(dst), &(src1), &(src2), NR_CPUS)

static inline int __cpus_and(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, int nbits)

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_and(dstp->bits, src1p->bits, src2p->bits, nbits);

}



#define cpus_or(dst, src1, src2) __cpus_or(&(dst), &(src1), &(src2), NR_CPUS)

static inline void __cpus_or(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, int nbits)

					const cpumask_t *src2p, unsigned int nbits)

{

	bitmap_or(dstp->bits, src1p->bits, src2p->bits, nbits);

}



#define cpus_xor(dst, src1, src2) __cpus_xor(&(dst), &(src1), &(src2), NR_CPUS)

static inline void __cpus_xor(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, int nbits)

					const cpumask_t *src2p, unsigned int nbits)

{

	bitmap_xor(dstp->bits, src1p->bits, src2p->bits, nbits);

}
@@ -949,40 +949,40 @@ static inline void __cpus_xor(cpumask_t *dstp, const cpumask_t *src1p, 
#define cpus_andnot(dst, src1, src2) \

				__cpus_andnot(&(dst), &(src1), &(src2), NR_CPUS)

static inline int __cpus_andnot(cpumask_t *dstp, const cpumask_t *src1p,

					const cpumask_t *src2p, int nbits)

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_andnot(dstp->bits, src1p->bits, src2p->bits, nbits);

}



#define cpus_equal(src1, src2) __cpus_equal(&(src1), &(src2), NR_CPUS)

static inline int __cpus_equal(const cpumask_t *src1p,

					const cpumask_t *src2p, int nbits)

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_equal(src1p->bits, src2p->bits, nbits);

}



#define cpus_intersects(src1, src2) __cpus_intersects(&(src1), &(src2), NR_CPUS)

static inline int __cpus_intersects(const cpumask_t *src1p,

					const cpumask_t *src2p, int nbits)

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_intersects(src1p->bits, src2p->bits, nbits);

}



#define cpus_subset(src1, src2) __cpus_subset(&(src1), &(src2), NR_CPUS)

static inline int __cpus_subset(const cpumask_t *src1p,

					const cpumask_t *src2p, int nbits)

					const cpumask_t *src2p, unsigned int nbits)

{

	return bitmap_subset(src1p->bits, src2p->bits, nbits);

}



#define cpus_empty(src) __cpus_empty(&(src), NR_CPUS)

static inline int __cpus_empty(const cpumask_t *srcp, int nbits)

static inline int __cpus_empty(const cpumask_t *srcp, unsigned int nbits)

{

	return bitmap_empty(srcp->bits, nbits);

}



#define cpus_weight(cpumask) __cpus_weight(&(cpumask), NR_CPUS)

static inline int __cpus_weight(const cpumask_t *srcp, int nbits)

static inline int __cpus_weight(const cpumask_t *srcp, unsigned int nbits)

{

	return bitmap_weight(srcp->bits, nbits);

}