diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-03-03 16:49:20 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-03-03 22:34:15 -0300 |
commit | 811f35ff59b6f99ae272d6f5b96bc9e974f88196 (patch) | |
tree | 1db99c24a521982c87a0786fb0814e36f369996e /tools | |
parent | df4b933e0e51e43bd27a495dc747db0851e6dd34 (diff) | |
download | linux-stable-811f35ff59b6f99ae272d6f5b96bc9e974f88196.tar.gz linux-stable-811f35ff59b6f99ae272d6f5b96bc9e974f88196.tar.bz2 linux-stable-811f35ff59b6f99ae272d6f5b96bc9e974f88196.zip |
tools headers: Synchronize {linux,vdso}/bits.h with the kernel sources
To pick up the changes in this cset:
cbdb1f163af2bb90 ("vdso/bits.h: Add BIT_ULL() for the sake of consistency")
That just causes perf to rebuild, the macro included doesn't clash with
anything in tools/{perf,objtool,bpf}.
This addresses this perf build warning:
Warning: Kernel ABI header at 'tools/include/linux/bits.h' differs from latest version at 'include/linux/bits.h'
diff -u tools/include/linux/bits.h include/linux/bits.h
Warning: Kernel ABI header at 'tools/include/vdso/bits.h' differs from latest version at 'include/vdso/bits.h'
diff -u tools/include/vdso/bits.h include/vdso/bits.h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/include/linux/bits.h | 1 | ||||
-rw-r--r-- | tools/include/vdso/bits.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/linux/bits.h b/tools/include/linux/bits.h index 87d112650dfb..7c0cf5031abe 100644 --- a/tools/include/linux/bits.h +++ b/tools/include/linux/bits.h @@ -6,7 +6,6 @@ #include <vdso/bits.h> #include <asm/bitsperlong.h> -#define BIT_ULL(nr) (ULL(1) << (nr)) #define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG)) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) #define BIT_ULL_MASK(nr) (ULL(1) << ((nr) % BITS_PER_LONG_LONG)) diff --git a/tools/include/vdso/bits.h b/tools/include/vdso/bits.h index 6d005a1f5d94..388b212088ea 100644 --- a/tools/include/vdso/bits.h +++ b/tools/include/vdso/bits.h @@ -5,5 +5,6 @@ #include <vdso/const.h> #define BIT(nr) (UL(1) << (nr)) +#define BIT_ULL(nr) (ULL(1) << (nr)) #endif /* __VDSO_BITS_H */ |