tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
tools headers asm: Sync fls headers header with the kernel sources
To pick the changes in:
6606c8c7e8188656 ("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>
+4
-4
+1
-1
tools/include/asm-generic/bitops/__fls.h
+1
-1
tools/include/asm-generic/bitops/__fls.h
···
10
10
*
11
11
* Undefined if no set bit exists, so code should check against 0 first.
12
12
*/
13
-
static __always_inline unsigned int generic___fls(unsigned long word)
13
+
static __always_inline __attribute_const__ unsigned int generic___fls(unsigned long word)
14
14
{
15
15
unsigned int num = BITS_PER_LONG - 1;
16
16
+1
-1
tools/include/asm-generic/bitops/fls.h
+1
-1
tools/include/asm-generic/bitops/fls.h
+2
-2
tools/include/asm-generic/bitops/fls64.h
+2
-2
tools/include/asm-generic/bitops/fls64.h
···
16
16
* at position 64.
17
17
*/
18
18
#if BITS_PER_LONG == 32
19
-
static __always_inline int fls64(__u64 x)
19
+
static __always_inline __attribute_const__ int fls64(__u64 x)
20
20
{
21
21
__u32 h = x >> 32;
22
22
if (h)
···
24
24
return fls(x);
25
25
}
26
26
#elif BITS_PER_LONG == 64
27
-
static __always_inline int fls64(__u64 x)
27
+
static __always_inline __attribute_const__ int fls64(__u64 x)
28
28
{
29
29
if (x == 0)
30
30
return 0;