Commit fa7a1e8d 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:

  1e7933a5 ("uapi: Revert "bitops: avoid integer overflow in GENMASK(_ULL)"")

This addresses this perf build warning:

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

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

Acked-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Acked-by: default avatarYury Norov [NVIDIA] <yury.norov@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: I Hsin Cheng <richard120310@gmail.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
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/r/20250519214126.1652491-6-acme@kernel.org


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

tools/include/uapi/linux/bits.h

+2 −6
Original line number Diff line number Diff line
@@ -4,13 +4,9 @@ 
#ifndef _UAPI_LINUX_BITS_H

#define _UAPI_LINUX_BITS_H



#define __GENMASK(h, l) \

        (((~_UL(0)) - (_UL(1) << (l)) + 1) & \

         (~_UL(0) >> (__BITS_PER_LONG - 1 - (h))))

#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (BITS_PER_LONG - 1 - (h))))



#define __GENMASK_ULL(h, l) \

        (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \

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

#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))



#define __GENMASK_U128(h, l) \

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