Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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)
+6
-4
+2
MAINTAINERS
+2
MAINTAINERS
···
4181
4181
F: include/linux/find.h
4182
4182
F: include/linux/nodemask.h
4183
4183
F: include/linux/nodemask_types.h
4184
+
F: include/uapi/linux/bits.h
4184
4185
F: include/vdso/bits.h
4185
4186
F: lib/bitmap-str.c
4186
4187
F: lib/bitmap.c
···
4194
4193
F: tools/include/linux/bitmap.h
4195
4194
F: tools/include/linux/bits.h
4196
4195
F: tools/include/linux/find.h
4196
+
F: tools/include/uapi/linux/bits.h
4197
4197
F: tools/include/vdso/bits.h
4198
4198
F: tools/lib/bitmap.c
4199
4199
F: tools/lib/find_bit.c
+2
-2
include/uapi/linux/bits.h
+2
-2
include/uapi/linux/bits.h
···
4
4
#ifndef _UAPI_LINUX_BITS_H
5
5
#define _UAPI_LINUX_BITS_H
6
6
7
-
#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (BITS_PER_LONG - 1 - (h))))
7
+
#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (__BITS_PER_LONG - 1 - (h))))
8
8
9
-
#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))
9
+
#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h))))
10
10
11
11
#define __GENMASK_U128(h, l) \
12
12
((_BIT128((h)) << 1) - (_BIT128(l)))
+2
-2
tools/include/uapi/linux/bits.h
+2
-2
tools/include/uapi/linux/bits.h
···
4
4
#ifndef _UAPI_LINUX_BITS_H
5
5
#define _UAPI_LINUX_BITS_H
6
6
7
-
#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (BITS_PER_LONG - 1 - (h))))
7
+
#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (__BITS_PER_LONG - 1 - (h))))
8
8
9
-
#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))
9
+
#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h))))
10
10
11
11
#define __GENMASK_U128(h, l) \
12
12
((_BIT128((h)) << 1) - (_BIT128(l)))