summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-07-26 23:43:24 +0100
committerMark Brown <broonie@kernel.org>2026-07-26 23:43:24 +0100
commit851529efbacdfb091ee907d06b542466cfd92a01 (patch)
tree78f36ff4798b9bb2e8b892b811dfe141c9a27d52 /tools
parent8c0819a11045817507ec1a2a81f75987a46eaf98 (diff)
parentbf7e3686b708683efe6b7ee79ae4c83a875dbc6f (diff)
downloadlinux-next-851529efbacdfb091ee907d06b542466cfd92a01.tar.gz
linux-next-851529efbacdfb091ee907d06b542466cfd92a01.zip
Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
Diffstat (limited to 'tools')
-rw-r--r--tools/include/linux/bits.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/include/linux/bits.h b/tools/include/linux/bits.h
index a40cc861b3a7..b7509f15718e 100644
--- a/tools/include/linux/bits.h
+++ b/tools/include/linux/bits.h
@@ -17,7 +17,7 @@
* position @h. For example
* GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
*/
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
/*
* Missing asm support
@@ -75,7 +75,7 @@
#define BIT_U32(nr) BIT_TYPE(u32, nr)
#define BIT_U64(nr) BIT_TYPE(u64, nr)
-#else /* defined(__ASSEMBLY__) */
+#else /* defined(__ASSEMBLER__) */
/*
* BUILD_BUG_ON_ZERO is not available in h files included from asm files,
@@ -84,6 +84,6 @@
#define GENMASK(h, l) __GENMASK(h, l)
#define GENMASK_ULL(h, l) __GENMASK_ULL(h, l)
-#endif /* !defined(__ASSEMBLY__) */
+#endif /* !defined(__ASSEMBLER__) */
#endif /* __LINUX_BITS_H */