diff options
Diffstat (limited to 'tools/include/linux/bitmap.h')
| -rw-r--r-- | tools/include/linux/bitmap.h | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h index afdf93bebaaf..65d0747c5205 100644 --- a/tools/include/linux/bitmap.h +++ b/tools/include/linux/bitmap.h @@ -11,10 +11,10 @@  #define DECLARE_BITMAP(name,bits) \  	unsigned long name[BITS_TO_LONGS(bits)] -int __bitmap_weight(const unsigned long *bitmap, int bits); +unsigned int __bitmap_weight(const unsigned long *bitmap, int bits);  void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,  		 const unsigned long *bitmap2, int bits); -int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, +bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,  		 const unsigned long *bitmap2, unsigned int bits);  bool __bitmap_equal(const unsigned long *bitmap1,  		    const unsigned long *bitmap2, unsigned int bits); @@ -45,7 +45,7 @@ static inline void bitmap_fill(unsigned long *dst, unsigned int nbits)  	dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits);  } -static inline int bitmap_empty(const unsigned long *src, unsigned nbits) +static inline bool bitmap_empty(const unsigned long *src, unsigned int nbits)  {  	if (small_const_nbits(nbits))  		return ! (*src & BITMAP_LAST_WORD_MASK(nbits)); @@ -53,7 +53,7 @@ static inline int bitmap_empty(const unsigned long *src, unsigned nbits)  	return find_first_bit(src, nbits) == nbits;  } -static inline int bitmap_full(const unsigned long *src, unsigned int nbits) +static inline bool bitmap_full(const unsigned long *src, unsigned int nbits)  {  	if (small_const_nbits(nbits))  		return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits)); @@ -61,7 +61,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)  	return find_first_zero_bit(src, nbits) == nbits;  } -static inline int bitmap_weight(const unsigned long *src, unsigned int nbits) +static inline unsigned int bitmap_weight(const unsigned long *src, unsigned int nbits)  {  	if (small_const_nbits(nbits))  		return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits)); @@ -146,7 +146,7 @@ size_t bitmap_scnprintf(unsigned long *bitmap, unsigned int nbits,   * @src2: operand 2   * @nbits: size of bitmap   */ -static inline int bitmap_and(unsigned long *dst, const unsigned long *src1, +static inline bool bitmap_and(unsigned long *dst, const unsigned long *src1,  			     const unsigned long *src2, unsigned int nbits)  {  	if (small_const_nbits(nbits))  | 
