Commit 6cb86079 authored by Namhyung Kim's avatar Namhyung Kim
Browse files

tools headers: Sync linux/bits.h with the kernel source 



To pick up the changes in this cset:

  104ea1c8 bits: unify the non-asm GENMASK*()
  6d447125 bits: split the definition of the asm and non-asm GENMASK*()

This addresses these perf build warnings:

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

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

Cc: Yury Norov <yury.norov@gmail.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent bd842ff4

tools/include/linux/bits.h

+6 −23
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ 
#ifndef __LINUX_BITS_H

#define __LINUX_BITS_H



#include <linux/const.h>

#include <vdso/bits.h>

#include <uapi/linux/bits.h>

#include <asm/bitsperlong.h>



#define BIT_MASK(nr)		(UL(1) << ((nr) % BITS_PER_LONG))

#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
@@ -50,10 +48,14 @@ 
	     (type_max(t) << (l) &				\

	      type_max(t) >> (BITS_PER_TYPE(t) - 1 - (h)))))



#define GENMASK(h, l)		GENMASK_TYPE(unsigned long, h, l)

#define GENMASK_ULL(h, l)	GENMASK_TYPE(unsigned long long, h, l)



#define GENMASK_U8(h, l)	GENMASK_TYPE(u8, h, l)

#define GENMASK_U16(h, l)	GENMASK_TYPE(u16, h, l)

#define GENMASK_U32(h, l)	GENMASK_TYPE(u32, h, l)

#define GENMASK_U64(h, l)	GENMASK_TYPE(u64, h, l)

#define GENMASK_U128(h, l)	GENMASK_TYPE(u128, h, l)



/*

 * Fixed-type variants of BIT(), with additional checks like GENMASK_TYPE(). The
@@ -79,28 +81,9 @@ 
 * BUILD_BUG_ON_ZERO is not available in h files included from asm files,

 * disable the input check if that is the case.

 */

#define GENMASK_INPUT_CHECK(h, l) 0

#define GENMASK(h, l)		__GENMASK(h, l)

#define GENMASK_ULL(h, l)	__GENMASK_ULL(h, l)



#endif /* !defined(__ASSEMBLY__) */



#define GENMASK(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))

#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 __int128' 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 */