Skip to content

Commit 811f35f

Browse files
committed
tools headers: Synchronize {linux,vdso}/bits.h with the kernel sources
To pick up the changes in this cset: cbdb1f1 ("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 <[email protected]>
1 parent df4b933 commit 811f35f

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

tools/include/linux/bits.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <vdso/bits.h>
77
#include <asm/bitsperlong.h>
88

9-
#define BIT_ULL(nr) (ULL(1) << (nr))
109
#define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG))
1110
#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
1211
#define BIT_ULL_MASK(nr) (ULL(1) << ((nr) % BITS_PER_LONG_LONG))

tools/include/vdso/bits.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
#include <vdso/const.h>
66

77
#define BIT(nr) (UL(1) << (nr))
8+
#define BIT_ULL(nr) (ULL(1) << (nr))
89

910
#endif /* __VDSO_BITS_H */

0 commit comments

Comments
 (0)