Maksytka/linux
1
1
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-11-30 23:16:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
To pick the changes in:

  6606c8c7e8 ("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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2025-11-03 13:35:06 -03:00
parent fc9ef9118d
commit 549042f167
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/include/asm-generic/bitops/__fls.h
View File

@@ -10,7 +10,7 @@
* *
* Undefined if no set bit exists, so code should check against 0 first. * 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; unsigned int num = BITS_PER_LONG - 1;

2
tools/include/asm-generic/bitops/fls.h
View File

@@ -10,7 +10,7 @@
* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. * 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; int r = 32;

4
tools/include/asm-generic/bitops/fls64.h
View File

@@ -16,7 +16,7 @@
* at position 64. * at position 64.
*/ */
#if BITS_PER_LONG == 32 #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; __u32 h = x >> 32;
if (h) if (h)
@@ -24,7 +24,7 @@ static __always_inline int fls64(__u64 x)
return fls(x); return fls(x);
} }
#elif BITS_PER_LONG == 64 #elif BITS_PER_LONG == 64
static __always_inline int fls64(__u64 x) static __always_inline __attribute_const__ int fls64(__u64 x)
{ {
if (x == 0) if (x == 0)
return 0; return 0;