diff --git a/drivers/gpu/nvgpu/include/nvgpu/allocator.h b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
index 937a28cd8..5bceeac50 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/allocator.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
@@ -38,7 +38,13 @@
 #include <nvgpu/types.h>
 #include <nvgpu/utils.h>
 
-/* #define ALLOCATOR_DEBUG_FINE */
+/*
+ * Enable this flag to get finer control over allocator debug messaging
+ * (see below).
+ */
+#if 0
+#define ALLOCATOR_DEBUG_FINE
+#endif
 
 struct nvgpu_allocator;
 struct nvgpu_alloc_carveout;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
index f8a956681..d83ad18e6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/kmem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
@@ -67,7 +67,10 @@ struct nvgpu_kmem_cache;
  * Since this is a fairly high overhead operation and is only necessary for
  * debugging actual bugs it's left here for developers to enable.
  */
-/* #define __NVGPU_SAVE_KALLOC_STACK_TRACES */
+
+#if 0
+#define __NVGPU_SAVE_KALLOC_STACK_TRACES
+#endif
 
 /*
  * Defined per-OS.