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

tools: sync find_next_bit implementation 

Sync the implementation with recent kernel changes.

Link: https://lkml.kernel.org/r/20210401003153.97325-9-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 5c88af59

tools/include/asm-generic/bitops/find.h

+21 −6
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_

#define _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_



extern unsigned long _find_next_bit(const unsigned long *addr1,

		const unsigned long *addr2, unsigned long nbits,

		unsigned long start, unsigned long invert, unsigned long le);



#ifndef find_next_bit

/**

 * find_next_bit - find the next set bit in a memory region
@@ -12,8 +16,12 @@ 
 * Returns the bit number for the next set bit

 * If no bits are set, returns @size.

 */

extern unsigned long find_next_bit(const unsigned long *addr, unsigned long

		size, unsigned long offset);

static inline

unsigned long find_next_bit(const unsigned long *addr, unsigned long size,

			    unsigned long offset)

{

	return _find_next_bit(addr, NULL, size, offset, 0UL, 0);

}

#endif



#ifndef find_next_and_bit
@@ -27,13 +35,16 @@ extern unsigned long find_next_bit(const unsigned long *addr, unsigned long 
 * Returns the bit number for the next set bit

 * If no bits are set, returns @size.

 */

extern unsigned long find_next_and_bit(const unsigned long *addr1,

static inline

unsigned long find_next_and_bit(const unsigned long *addr1,

		const unsigned long *addr2, unsigned long size,

		unsigned long offset);

		unsigned long offset)

{

	return _find_next_bit(addr1, addr2, size, offset, 0UL, 0);

}

#endif



#ifndef find_next_zero_bit



/**

 * find_next_zero_bit - find the next cleared bit in a memory region

 * @addr: The address to base the search on
@@ -43,8 +54,12 @@ extern unsigned long find_next_and_bit(const unsigned long *addr1, 
 * Returns the bit number of the next zero bit

 * If no bits are zero, returns @size.

 */

static inline

unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,

				 unsigned long offset);

				 unsigned long offset)

{

	return _find_next_bit(addr, NULL, size, offset, ~0UL, 0);

}

#endif



#ifndef find_first_bit

tools/lib/find_bit.c

+21 −31
Original line number Diff line number Diff line
@@ -28,11 +28,12 @@ 
 *    searching it for one bits.

 *  - The optional "addr2", which is anded with "addr1" if present.

 */

static inline unsigned long _find_next_bit(const unsigned long *addr1,

unsigned long _find_next_bit(const unsigned long *addr1,

		const unsigned long *addr2, unsigned long nbits,

		unsigned long start, unsigned long invert)

		unsigned long start, unsigned long invert, unsigned long le)

{

	unsigned long tmp;

	unsigned long tmp, mask;

	(void) le;



	if (unlikely(start >= nbits))

		return nbits;
@@ -43,7 +44,19 @@ static inline unsigned long _find_next_bit(const unsigned long *addr1, 
	tmp ^= invert;



	/* Handle 1st word. */

	tmp &= BITMAP_FIRST_WORD_MASK(start);

	mask = BITMAP_FIRST_WORD_MASK(start);



	/*

	 * Due to the lack of swab() in tools, and the fact that it doesn't

	 * need little-endian support, just comment it out

	 */

#if (0)

	if (le)

		mask = swab(mask);

#endif



	tmp &= mask;



	start = round_down(start, BITS_PER_LONG);



	while (!tmp) {
@@ -57,18 +70,12 @@ static inline unsigned long _find_next_bit(const unsigned long *addr1, 
		tmp ^= invert;

	}



	return min(start + __ffs(tmp), nbits);

}

#if (0)

	if (le)

		tmp = swab(tmp);

#endif



#ifndef find_next_bit

/*

 * Find the next set bit in a memory region.

 */

unsigned long find_next_bit(const unsigned long *addr, unsigned long size,

			    unsigned long offset)

{

	return _find_next_bit(addr, NULL, size, offset, 0UL);

	return min(start + __ffs(tmp), nbits);

}

#endif
@@ -105,20 +112,3 @@ unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size) 
	return size;

}

#endif
 


#ifndef find_next_zero_bit

unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,

				 unsigned long offset)

{

	return _find_next_bit(addr, NULL, size, offset, ~0UL);

}

#endif



#ifndef find_next_and_bit

unsigned long find_next_and_bit(const unsigned long *addr1,

		const unsigned long *addr2, unsigned long size,

		unsigned long offset)

{

	return _find_next_bit(addr1, addr2, size, offset, 0UL);

}

#endif