diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu
index 9ba6f49a0..e059002a2 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu
+++ b/drivers/gpu/nvgpu/Makefile.nvgpu
@@ -137,10 +137,14 @@ nvgpu-$(CONFIG_DEBUG_FS) += \
 	common/linux/debug_mm.o \
 	common/linux/debug_allocator.o \
 	common/linux/debug_hal.o \
-	common/linux/debug_kmem.o \
 	common/linux/debug_clk.o \
 	common/linux/debug_xve.o
 
+ifeq ($(CONFIG_NVGPU_TRACK_MEM_USAGE),y)
+nvgpu-$(CONFIG_DEBUG_FS) += \
+	common/linux/debug_kmem.o
+endif
+
 nvgpu-$(CONFIG_TEGRA_GK20A) += common/linux/platform_gk20a_tegra.o
 nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o
 nvgpu-$(CONFIG_GK20A_PCI) += common/linux/pci.o
diff --git a/drivers/gpu/nvgpu/common/linux/debug_kmem.c b/drivers/gpu/nvgpu/common/linux/debug_kmem.c
index 04fb8b684..a0c7d47d0 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_kmem.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_kmem.c
@@ -18,7 +18,6 @@
 #include "debug_kmem.h"
 #include "kmem_priv.h"
 
-#ifdef CONFIG_NVGPU_TRACK_MEM_USAGE
 /**
  * to_human_readable_bytes - Determine  suffix for passed size.
  *
@@ -311,4 +310,3 @@ void nvgpu_kmem_debugfs_init(struct gk20a *g)
 				   l->debugfs_kmem,
 				   g, &__kmem_traces_fops);
 }
-#endif