Commit 33c4fa8c authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds

linux/nodemask.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.
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 8b4daad5
...@@ -120,13 +120,13 @@ static inline void __node_clear(int node, volatile nodemask_t *dstp) ...@@ -120,13 +120,13 @@ static inline void __node_clear(int node, volatile nodemask_t *dstp)
} }
#define nodes_setall(dst) __nodes_setall(&(dst), MAX_NUMNODES) #define nodes_setall(dst) __nodes_setall(&(dst), MAX_NUMNODES)
static inline void __nodes_setall(nodemask_t *dstp, int nbits) static inline void __nodes_setall(nodemask_t *dstp, unsigned int nbits)
{ {
bitmap_fill(dstp->bits, nbits); bitmap_fill(dstp->bits, nbits);
} }
#define nodes_clear(dst) __nodes_clear(&(dst), MAX_NUMNODES) #define nodes_clear(dst) __nodes_clear(&(dst), MAX_NUMNODES)
static inline void __nodes_clear(nodemask_t *dstp, int nbits) static inline void __nodes_clear(nodemask_t *dstp, unsigned int nbits)
{ {
bitmap_zero(dstp->bits, nbits); bitmap_zero(dstp->bits, nbits);
} }
...@@ -144,7 +144,7 @@ static inline int __node_test_and_set(int node, nodemask_t *addr) ...@@ -144,7 +144,7 @@ static inline int __node_test_and_set(int node, nodemask_t *addr)
#define nodes_and(dst, src1, src2) \ #define nodes_and(dst, src1, src2) \
__nodes_and(&(dst), &(src1), &(src2), MAX_NUMNODES) __nodes_and(&(dst), &(src1), &(src2), MAX_NUMNODES)
static inline void __nodes_and(nodemask_t *dstp, const nodemask_t *src1p, static inline void __nodes_and(nodemask_t *dstp, const nodemask_t *src1p,
const nodemask_t *src2p, int nbits) const nodemask_t *src2p, unsigned int nbits)
{ {
bitmap_and(dstp->bits, src1p->bits, src2p->bits, nbits); bitmap_and(dstp->bits, src1p->bits, src2p->bits, nbits);
} }
...@@ -152,7 +152,7 @@ static inline void __nodes_and(nodemask_t *dstp, const nodemask_t *src1p, ...@@ -152,7 +152,7 @@ static inline void __nodes_and(nodemask_t *dstp, const nodemask_t *src1p,
#define nodes_or(dst, src1, src2) \ #define nodes_or(dst, src1, src2) \
__nodes_or(&(dst), &(src1), &(src2), MAX_NUMNODES) __nodes_or(&(dst), &(src1), &(src2), MAX_NUMNODES)
static inline void __nodes_or(nodemask_t *dstp, const nodemask_t *src1p, static inline void __nodes_or(nodemask_t *dstp, const nodemask_t *src1p,
const nodemask_t *src2p, int nbits) const nodemask_t *src2p, unsigned int nbits)
{ {
bitmap_or(dstp->bits, src1p->bits, src2p->bits, nbits); bitmap_or(dstp->bits, src1p->bits, src2p->bits, nbits);
} }
...@@ -160,7 +160,7 @@ static inline void __nodes_or(nodemask_t *dstp, const nodemask_t *src1p, ...@@ -160,7 +160,7 @@ static inline void __nodes_or(nodemask_t *dstp, const nodemask_t *src1p,
#define nodes_xor(dst, src1, src2) \ #define nodes_xor(dst, src1, src2) \
__nodes_xor(&(dst), &(src1), &(src2), MAX_NUMNODES) __nodes_xor(&(dst), &(src1), &(src2), MAX_NUMNODES)
static inline void __nodes_xor(nodemask_t *dstp, const nodemask_t *src1p, static inline void __nodes_xor(nodemask_t *dstp, const nodemask_t *src1p,
const nodemask_t *src2p, int nbits) const nodemask_t *src2p, unsigned int nbits)
{ {
bitmap_xor(dstp->bits, src1p->bits, src2p->bits, nbits); bitmap_xor(dstp->bits, src1p->bits, src2p->bits, nbits);
} }
...@@ -168,7 +168,7 @@ static inline void __nodes_xor(nodemask_t *dstp, const nodemask_t *src1p, ...@@ -168,7 +168,7 @@ static inline void __nodes_xor(nodemask_t *dstp, const nodemask_t *src1p,
#define nodes_andnot(dst, src1, src2) \ #define nodes_andnot(dst, src1, src2) \
__nodes_andnot(&(dst), &(src1), &(src2), MAX_NUMNODES) __nodes_andnot(&(dst), &(src1), &(src2), MAX_NUMNODES)
static inline void __nodes_andnot(nodemask_t *dstp, const nodemask_t *src1p, static inline void __nodes_andnot(nodemask_t *dstp, const nodemask_t *src1p,
const nodemask_t *src2p, int nbits) const nodemask_t *src2p, unsigned int nbits)
{ {
bitmap_andnot(dstp->bits, src1p->bits, src2p->bits, nbits); bitmap_andnot(dstp->bits, src1p->bits, src2p->bits, nbits);
} }
...@@ -176,7 +176,7 @@ static inline void __nodes_andnot(nodemask_t *dstp, const nodemask_t *src1p, ...@@ -176,7 +176,7 @@ static inline void __nodes_andnot(nodemask_t *dstp, const nodemask_t *src1p,
#define nodes_complement(dst, src) \ #define nodes_complement(dst, src) \
__nodes_complement(&(dst), &(src), MAX_NUMNODES) __nodes_complement(&(dst), &(src), MAX_NUMNODES)
static inline void __nodes_complement(nodemask_t *dstp, static inline void __nodes_complement(nodemask_t *dstp,
const nodemask_t *srcp, int nbits) const nodemask_t *srcp, unsigned int nbits)
{ {
bitmap_complement(dstp->bits, srcp->bits, nbits); bitmap_complement(dstp->bits, srcp->bits, nbits);
} }
...@@ -184,7 +184,7 @@ static inline void __nodes_complement(nodemask_t *dstp, ...@@ -184,7 +184,7 @@ static inline void __nodes_complement(nodemask_t *dstp,
#define nodes_equal(src1, src2) \ #define nodes_equal(src1, src2) \
__nodes_equal(&(src1), &(src2), MAX_NUMNODES) __nodes_equal(&(src1), &(src2), MAX_NUMNODES)
static inline int __nodes_equal(const nodemask_t *src1p, static inline int __nodes_equal(const nodemask_t *src1p,
const nodemask_t *src2p, int nbits) const nodemask_t *src2p, unsigned int nbits)
{ {
return bitmap_equal(src1p->bits, src2p->bits, nbits); return bitmap_equal(src1p->bits, src2p->bits, nbits);
} }
...@@ -192,7 +192,7 @@ static inline int __nodes_equal(const nodemask_t *src1p, ...@@ -192,7 +192,7 @@ static inline int __nodes_equal(const nodemask_t *src1p,
#define nodes_intersects(src1, src2) \ #define nodes_intersects(src1, src2) \
__nodes_intersects(&(src1), &(src2), MAX_NUMNODES) __nodes_intersects(&(src1), &(src2), MAX_NUMNODES)
static inline int __nodes_intersects(const nodemask_t *src1p, static inline int __nodes_intersects(const nodemask_t *src1p,
const nodemask_t *src2p, int nbits) const nodemask_t *src2p, unsigned int nbits)
{ {
return bitmap_intersects(src1p->bits, src2p->bits, nbits); return bitmap_intersects(src1p->bits, src2p->bits, nbits);
} }
...@@ -200,25 +200,25 @@ static inline int __nodes_intersects(const nodemask_t *src1p, ...@@ -200,25 +200,25 @@ static inline int __nodes_intersects(const nodemask_t *src1p,
#define nodes_subset(src1, src2) \ #define nodes_subset(src1, src2) \
__nodes_subset(&(src1), &(src2), MAX_NUMNODES) __nodes_subset(&(src1), &(src2), MAX_NUMNODES)
static inline int __nodes_subset(const nodemask_t *src1p, static inline int __nodes_subset(const nodemask_t *src1p,
const nodemask_t *src2p, int nbits) const nodemask_t *src2p, unsigned int nbits)
{ {
return bitmap_subset(src1p->bits, src2p->bits, nbits); return bitmap_subset(src1p->bits, src2p->bits, nbits);
} }
#define nodes_empty(src) __nodes_empty(&(src), MAX_NUMNODES) #define nodes_empty(src) __nodes_empty(&(src), MAX_NUMNODES)
static inline int __nodes_empty(const nodemask_t *srcp, int nbits) static inline int __nodes_empty(const nodemask_t *srcp, unsigned int nbits)
{ {
return bitmap_empty(srcp->bits, nbits); return bitmap_empty(srcp->bits, nbits);
} }
#define nodes_full(nodemask) __nodes_full(&(nodemask), MAX_NUMNODES) #define nodes_full(nodemask) __nodes_full(&(nodemask), MAX_NUMNODES)
static inline int __nodes_full(const nodemask_t *srcp, int nbits) static inline int __nodes_full(const nodemask_t *srcp, unsigned int nbits)
{ {
return bitmap_full(srcp->bits, nbits); return bitmap_full(srcp->bits, nbits);
} }
#define nodes_weight(nodemask) __nodes_weight(&(nodemask), MAX_NUMNODES) #define nodes_weight(nodemask) __nodes_weight(&(nodemask), MAX_NUMNODES)
static inline int __nodes_weight(const nodemask_t *srcp, int nbits) static inline int __nodes_weight(const nodemask_t *srcp, unsigned int nbits)
{ {
return bitmap_weight(srcp->bits, nbits); return bitmap_weight(srcp->bits, nbits);
} }
......
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