Commit e5b9252d authored by Yury Norov's avatar Yury Norov Committed by Linus Torvalds
Browse files

tools: bitmap: sync function declarations with the kernel 

Some functions in tools/include/linux/bitmap.h declare nbits as int.  In
the kernel nbits is declared as unsigned int.

Link: https://lkml.kernel.org/r/20210401003153.97325-3-yury.norov@gmail.com


Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
Acked-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Alexey Klimov <aklimov@redhat.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Sterba <dsterba@suse.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jianpeng Ma <jianpeng.ma@intel.com>
Cc: Joe Perches <joe@perches.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Rich Felker <dalias@libc.org>
Cc: Stefano Brivio <sbrivio@redhat.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Yoshinori Sato <ysato@users.osdn.me>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d1d1a2cd

tools/include/linux/bitmap.h

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void bitmap_clear(unsigned long *map, unsigned int start, int len); 
#define small_const_nbits(nbits) \

	(__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)



static inline void bitmap_zero(unsigned long *dst, int nbits)

static inline void bitmap_zero(unsigned long *dst, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		*dst = 0UL;
@@ -66,7 +66,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, int nbits)

static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
@@ -74,7 +74,7 @@ static inline int bitmap_weight(const unsigned long *src, int nbits) 
}



static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,

			     const unsigned long *src2, int nbits)

			     const unsigned long *src2, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		*dst = *src1 | *src2;
@@ -141,7 +141,7 @@ static inline void bitmap_free(unsigned long *bitmap) 
 * @buf: buffer to store output

 * @size: size of @buf

 */

size_t bitmap_scnprintf(unsigned long *bitmap, int nbits,

size_t bitmap_scnprintf(unsigned long *bitmap, unsigned int nbits,

			char *buf, size_t size);



/**

tools/lib/bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, 
		dst[k] = bitmap1[k] | bitmap2[k];

}



size_t bitmap_scnprintf(unsigned long *bitmap, int nbits,

size_t bitmap_scnprintf(unsigned long *bitmap, unsigned int nbits,

			char *buf, size_t size)

{

	/* current bit is 'cur', most recently seen range is [rbot, rtop] */

	int cur, rbot, rtop;

	unsigned int cur, rbot, rtop;

	bool first = true;

	size_t ret = 0;