diff --git a/include/linux/bits.h b/include/linux/bits.h
index 669d69441a62..6a6c603b7eac 100644
--- a/include/linux/bits.h
+++ b/include/linux/bits.h
@@ -3,11 +3,21 @@
 #define __LINUX_BITS_H
 
 #include <linux/const.h>
+#ifdef __GENKSYMS__
+#include <vdso/bits.h>
+/*
+ * Old version of this macro to preserve the CRC signatures of some drm symbols.
+ * Crazy but true...
+ */
+#define BIT_ULL(nr)		(1ULL << (nr))
+#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))
+#else
 #include <asm/bitsperlong.h>
 
 #define BIT(nr)			(UL(1) << (nr))
 #define BIT_ULL(nr)		(ULL(1) << (nr))
 #define BIT_MASK(nr)		(UL(1) << ((nr) % BITS_PER_LONG))
+#endif
 #define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
 #define BIT_ULL_MASK(nr)	(ULL(1) << ((nr) % BITS_PER_LONG_LONG))
 #define BIT_ULL_WORD(nr)	((nr) / BITS_PER_LONG_LONG)