Commit 549042f1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers asm: Sync fls headers header with the kernel sources 



To pick the changes in:

  6606c8c7 ("bitops: Add __attribute_const__ to generic ffs()-family implementations")

This addresses these tools build warnings:

  Warning: Kernel ABI header differences:
    diff -u tools/include/asm-generic/bitops/__fls.h include/asm-generic/bitops/__fls.h
    diff -u tools/include/asm-generic/bitops/fls.h include/asm-generic/bitops/fls.h
    diff -u tools/include/asm-generic/bitops/fls64.h include/asm-generic/bitops/fls64.h

Please see tools/include/uapi/README for further details.

Cc: Kees Cook <kees@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fc9ef911

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 *

 * Undefined if no set bit exists, so code should check against 0 first.

 */

static __always_inline unsigned int generic___fls(unsigned long word)

static __always_inline __attribute_const__ unsigned int generic___fls(unsigned long word)

{

	unsigned int num = BITS_PER_LONG - 1;

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.

 */



static __always_inline int generic_fls(unsigned int x)

static __always_inline __attribute_const__ int generic_fls(unsigned int x)

{

	int r = 32;

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * at position 64.

 */

#if BITS_PER_LONG == 32

static __always_inline int fls64(__u64 x)

static __always_inline __attribute_const__ int fls64(__u64 x)

{

	__u32 h = x >> 32;

	if (h)
@@ -24,7 +24,7 @@ static __always_inline int fls64(__u64 x) 
	return fls(x);

}

#elif BITS_PER_LONG == 64

static __always_inline int fls64(__u64 x)

static __always_inline __attribute_const__ int fls64(__u64 x)

{

	if (x == 0)

		return 0;