bitmap-for-6.16-rc2

Fix for __GENMASK() and __GENMASK_ULL() in UAPI.
 -----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEEi8GdvG6xMhdgpu/4sUSA/TofvsgFAmhLG1oACgkQsUSA/Tof
 vsiOUwv/cTVVe2Q6vwOMoH02p0f5MhzSNCnJ7ogdBjYxVKzUi89w4Yc+u7VXg0pH
 35a51IGoqHMKzAa9r1JhG06CFWE7acrE9wvUvhIfIRv9nkK2Cu3RGJq+xX9oadUl
 AeOOR3nRXFbUzJg2PQxY15UdFCa58nrr6UlnrD6kgYUoTGc6WbCyqjHP3E1KAyTo
 JBvHiSd2Vpn+QhqGIitME7C4s+Q/tO9tPnlWzjoW/tdPrmUtNFcC08bvZKmUEgj2
 fOiGKWZPExhBeDYQ6rDgCKlSMaHeHnhfIR/tMmcHIa92Bk5Nl3DRScWXrZJtoQqB
 LocrYgTIukIKKp+x12KOzAYan0K0Ro8McH7Fk1ItqEO33ZfsRhrCJqDvuPEFZb6s
 f7N9nEucPZ4IRvj2OxpvACYE70xP0Hb20aaNhlkreLcp0bvf46F8YlJU4e6ToGTY
 XL50B81lmvX7zVglDaJAfz8PHrNyV3IqkJtQ2Vol3xdfYjU73U2pOGTyJmTqxLAF
 TbFZn3cS
 =jBAP
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-06-12 12:32:09 -07:00
commit d080d3b544

View File

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