diff --git a/drivers/gpu/nvgpu/include/nvgpu/bitops.h b/drivers/gpu/nvgpu/include/nvgpu/bitops.h
index 26b6e19d5..8760708e4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/bitops.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/bitops.h
@@ -22,6 +22,14 @@
 #ifndef __NVGPU_BITOPS_H__
 #define __NVGPU_BITOPS_H__
 
+#include <nvgpu/types.h>
+
+/*
+ * Explicit sizes for bit definitions. Please use these instead of BIT().
+ */
+#define BIT32(i)	(U32(1) << (i))
+#define BIT64(i)	(U64(1) << (i))
+
 #ifdef __KERNEL__
 #include <linux/bitops.h>
 #include <linux/bitmap.h>
diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/bitops.h b/drivers/gpu/nvgpu/include/nvgpu/posix/bitops.h
index 94618d149..e8c663b03 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/posix/bitops.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/posix/bitops.h
@@ -33,7 +33,10 @@
 #define BITS_TO_LONGS(bits)			\
 	(bits + (BITS_PER_LONG - 1) / BITS_PER_LONG)
 
-#define BIT(i)		(1ULL << (i))
+/*
+ * Deprecated; use the explicit BITxx() macros instead.
+ */
+#define BIT(i)		BIT64(i)
 
 #define GENMASK(h, l) \
 	(((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h))))