tools headers: Synchronize linux/bits.h with the kernel sources (b6589117) · Commits · 戴 / test

To pick up the changes in this cset: ("linux/bits.h: make BIT(), GENMASK(), and friends available in assembly") To address this tools/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 Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lkml.kernel.org/n/tip-1if3iga5r3di6oyddgxsr225@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/include/linux/bits.h

+10 −7

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#ifndef __LINUX_BITS_H
		#define __LINUX_BITS_H

		#include <linux/const.h>
		#include <asm/bitsperlong.h>

		#define BIT(nr) (1UL << (nr))
		#define BIT_ULL(nr) (1ULL << (nr))
		#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
		#define BIT(nr) (UL(1) << (nr))
		#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) (1ULL << ((nr) % BITS_PER_LONG_LONG))
		#define BIT_ULL_MASK(nr) (ULL(1) << ((nr) % BITS_PER_LONG_LONG))
		#define BIT_ULL_WORD(nr) ((nr) / BITS_PER_LONG_LONG)
		#define BITS_PER_BYTE 8

		@@ -17,10 +19,11 @@
		* GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
		*/
		#define GENMASK(h, l) \
		(((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
		(((~UL(0)) - (UL(1) << (l)) + 1) & \
		(~UL(0) >> (BITS_PER_LONG - 1 - (h))))

		#define GENMASK_ULL(h, l) \
		(((~0ULL) - (1ULL << (l)) + 1) & \
		(~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))
		(((~ULL(0)) - (ULL(1) << (l)) + 1) & \
		(~ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))

		#endif /* __LINUX_BITS_H */

Admin message