summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2022-11-28 16:10:03 +0200
committerThomas Gleixner <tglx@linutronix.de>2023-01-31 14:42:10 +0100
commitcbdb1f163af2bb90d01be1f0263df1d8d5c9d9d3 (patch)
tree3b998dc8b1b4c87ef0b4020bbc2d92d84ca06ef2
parent0c52310f260014d95c1310364379772cb74cf82d (diff)
downloadlinux-cbdb1f163af2bb90d01be1f0263df1d8d5c9d9d3.tar.gz
linux-cbdb1f163af2bb90d01be1f0263df1d8d5c9d9d3.tar.bz2
linux-cbdb1f163af2bb90d01be1f0263df1d8d5c9d9d3.zip
vdso/bits.h: Add BIT_ULL() for the sake of consistency
The minimization done in 3945ff37d2f4 ("linux/bits.h: Extract common header for vDSO") was required to isolate the VDSO build from the larger kernel header impact. The split added some inconsistency since BIT() and BIT_ULL() are now defined in the different files which confuses unprepared reader. Move BIT_ULL() to vdso/bits.h. No functional change. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20221128141003.77929-1-andriy.shevchenko@linux.intel.com
-rw-r--r--include/linux/bits.h1
-rw-r--r--include/vdso/bits.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bits.h b/include/linux/bits.h
index 87d112650dfb..7c0cf5031abe 100644
--- a/include/linux/bits.h
+++ b/include/linux/bits.h
@@ -6,7 +6,6 @@
#include <vdso/bits.h>
#include <asm/bitsperlong.h>
-#define BIT_ULL(nr) (ULL(1) << (nr))
#define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG))
#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
#define BIT_ULL_MASK(nr) (ULL(1) << ((nr) % BITS_PER_LONG_LONG))
diff --git a/include/vdso/bits.h b/include/vdso/bits.h
index 6d005a1f5d94..388b212088ea 100644
--- a/include/vdso/bits.h
+++ b/include/vdso/bits.h
@@ -5,5 +5,6 @@
#include <vdso/const.h>
#define BIT(nr) (UL(1) << (nr))
+#define BIT_ULL(nr) (ULL(1) << (nr))
#endif /* __VDSO_BITS_H */