hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/include/linux/bits.h
....@@ -6,10 +6,10 @@
66 #include <vdso/bits.h>
77 #include <asm/bitsperlong.h>
88
9
-#define BIT_ULL(nr) (1ULL << (nr))
10
-#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
9
+#define BIT_ULL(nr) (ULL(1) << (nr))
10
+#define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG))
1111 #define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
12
-#define BIT_ULL_MASK(nr) (1ULL << ((nr) % BITS_PER_LONG_LONG))
12
+#define BIT_ULL_MASK(nr) (ULL(1) << ((nr) % BITS_PER_LONG_LONG))
1313 #define BIT_ULL_WORD(nr) ((nr) / BITS_PER_LONG_LONG)
1414 #define BITS_PER_BYTE 8
1515
....@@ -18,11 +18,29 @@
1818 * position @h. For example
1919 * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
2020 */
21
-#define GENMASK(h, l) \
22
- (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
21
+#if !defined(__ASSEMBLY__)
22
+#include <linux/build_bug.h>
23
+#define GENMASK_INPUT_CHECK(h, l) \
24
+ (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
25
+ __is_constexpr((l) > (h)), (l) > (h), 0)))
26
+#else
27
+/*
28
+ * BUILD_BUG_ON_ZERO is not available in h files included from asm files,
29
+ * disable the input check if that is the case.
30
+ */
31
+#define GENMASK_INPUT_CHECK(h, l) 0
32
+#endif
2333
34
+#define __GENMASK(h, l) \
35
+ (((~UL(0)) - (UL(1) << (l)) + 1) & \
36
+ (~UL(0) >> (BITS_PER_LONG - 1 - (h))))
37
+#define GENMASK(h, l) \
38
+ (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
39
+
40
+#define __GENMASK_ULL(h, l) \
41
+ (((~ULL(0)) - (ULL(1) << (l)) + 1) & \
42
+ (~ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))
2443 #define GENMASK_ULL(h, l) \
25
- (((~0ULL) - (1ULL << (l)) + 1) & \
26
- (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))
44
+ (GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))
2745
2846 #endif /* __LINUX_BITS_H */