Commit 21a3a3d0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers: Synchronize {uapi/}linux/bits.h with the kernel sources 



To pick up the changes in this cset:

  947697c6 ("uapi: Define GENMASK_U128")

This addresses these perf build warnings:

  Warning: Kernel ABI header differences:
    diff -u tools/include/uapi/linux/bits.h include/uapi/linux/bits.h
    diff -u tools/include/linux/bits.h include/linux/bits.h

Please see tools/include/uapi/README for further details.

Acked-by: default avatarYury Norov <yury.norov@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/Zx-ZVH7bHqtFn8Dv@x1


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 08a7d252

tools/include/linux/bits.h

+15 −0
Original line number Diff line number Diff line
@@ -36,4 +36,19 @@ 
#define GENMASK_ULL(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))



#if !defined(__ASSEMBLY__)

/*

 * Missing asm support

 *

 * __GENMASK_U128() depends on _BIT128() which would not work

 * in the asm code, as it shifts an 'unsigned __init128' data

 * type instead of direct representation of 128 bit constants

 * such as long and unsigned long. The fundamental problem is

 * that a 128 bit constant will get silently truncated by the

 * gcc compiler.

 */

#define GENMASK_U128(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_U128(h, l))

#endif



#endif	/* __LINUX_BITS_H */

tools/include/uapi/linux/bits.h

+3 −0
Original line number Diff line number Diff line
@@ -12,4 +12,7 @@ 
        (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \

         (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h))))



#define __GENMASK_U128(h, l) \

	((_BIT128((h)) << 1) - (_BIT128(l)))



#endif /* _UAPI_LINUX_BITS_H */