diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-12 22:32:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-12 22:32:09 +0300 |
| commit | d080d3b54448501ddb0f9e1f85a8043253100f55 (patch) | |
| tree | 6a1ba9466aa1dd3e2b34f28c9612f5cc93d4a09e | |
| parent | 27605c8c0f69e319df156b471974e4e223035378 (diff) | |
| parent | 11fcf368506d347088e613edf6cd2604d70c454f (diff) | |
| download | linux-d080d3b54448501ddb0f9e1f85a8043253100f55.tar.xz | |
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
| -rw-r--r-- | include/uapi/linux/bits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/bits.h b/include/uapi/linux/bits.h index 682b406e1067..a04afef9efca 100644 --- a/include/uapi/linux/bits.h +++ b/include/uapi/linux/bits.h @@ -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))) |