diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-30 08:50:04 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-30 08:50:04 +0300 |
| commit | 815ac67919148f9d65537af550fd26e2cbbd47bb (patch) | |
| tree | d52e131ad5f44e95722d9277bae74fc22d9a9a60 /include/uapi/linux/bits.h | |
| parent | acc902de05b2b8229dc27820925b7573b6d2d34e (diff) | |
| parent | d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af (diff) | |
| download | linux-815ac67919148f9d65537af550fd26e2cbbd47bb.tar.xz | |
Merge 6.16-rc4 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux/bits.h')
| -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 a04afef9efca..682b406e1067 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))) |