Commit d080d3b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull bitmap fix from Yury Norov:
 "Fix for __GENMASK() and __GENMASK_ULL() in UAPI"

* tag 'bitmap-for-6.16-rc2' of https://github.com/norov/linux:
  uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again
parents 27605c8c 11fcf368

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)))