Commit 2dbae28a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bitmap-for-6.16-rc6' of https://github.com/norov/linux 

Pull bitops UAPI fix from Yury Norov:
 "Fix BITS_PER_LONG merge error

  Tomas' fix for __BITS_PER_LONG was effectively reverted by a wrong
  merge. Fix it and add the related files to MAINTAINERS"

* tag 'bitmap-for-6.16-rc6' of https://github.com/norov/linux:
  MAINTAINERS: bitmap: add UAPI headers
  uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again (2)
parents a3b5b88e 1afc85de

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -4181,6 +4181,7 @@ F: include/linux/cpumask_types.h 
F:	include/linux/find.h

F:	include/linux/nodemask.h

F:	include/linux/nodemask_types.h

F:	include/uapi/linux/bits.h

F:	include/vdso/bits.h

F:	lib/bitmap-str.c

F:	lib/bitmap.c
@@ -4193,6 +4194,7 @@ F: tools/include/linux/bitfield.h 
F:	tools/include/linux/bitmap.h

F:	tools/include/linux/bits.h

F:	tools/include/linux/find.h

F:	tools/include/uapi/linux/bits.h

F:	tools/include/vdso/bits.h

F:	tools/lib/bitmap.c

F:	tools/lib/find_bit.c

include/uapi/linux/bits.h

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

#define _UAPI_LINUX_BITS_H



#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_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)) << (l)) & (~_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)))

tools/include/uapi/linux/bits.h

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

#define _UAPI_LINUX_BITS_H



#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_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)) << (l)) & (~_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)))