diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index db77d40f5..03e16913e 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1562,13 +1562,14 @@ static int gk20a_probe(struct platform_device *dev)
 
 	gk20a_create_sysfs(&dev->dev);
 
+	gk20a->mm.bypass_smmu = platform->bypass_smmu;
+	gk20a->mm.disable_bigpage = platform->disable_bigpage;
+	gk20a->mm.has_physical_mode = true;
+
 #ifdef CONFIG_DEBUG_FS
 	spin_lock_init(&gk20a->debugfs_lock);
 	gk20a->mm.ltc_enabled = true;
 	gk20a->mm.ltc_enabled_debug = true;
-	gk20a->mm.bypass_smmu = platform->bypass_smmu;
-	gk20a->mm.disable_bigpage = platform->disable_bigpage;
-	gk20a->mm.has_physical_mode = true;
 	gk20a->debugfs_ltc_enabled =
 			debugfs_create_bool("ltc_enabled", S_IRUGO|S_IWUSR,
 				 platform->debugfs,
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.c b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.c
index a7378956d..2b351492a 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.c
@@ -1,7 +1,7 @@
 /*
  * gk20a allocator
  *
- * Copyright (c) 2011-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -1160,6 +1160,7 @@ static void balloc_init_alloc_debug(struct gk20a_allocator *a)
 					       a, &__alloc_fops);
 }
 
+#ifdef CONFIG_DEBUG_FS
 void gk20a_alloc_debugfs_init(struct platform_device *pdev)
 {
 	struct gk20a_platform *platform = platform_get_drvdata(pdev);
@@ -1172,3 +1173,4 @@ void gk20a_alloc_debugfs_init(struct platform_device *pdev)
 	debugfs_create_u32("tracing", 0664, balloc_debugfs_root,
 			   &balloc_tracing_on);
 }
+#endif
diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c
index a899c0cf0..01c7a2dc9 100644
--- a/drivers/gpu/nvgpu/pci.c
+++ b/drivers/gpu/nvgpu/pci.c
@@ -243,8 +243,10 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
 
 	g->mm.has_physical_mode = false;
 	g->mm.vidmem_is_vidmem = true;
+#ifdef CONFIG_DEBUG_FS
 	g->mm.ltc_enabled = true;
 	g->mm.ltc_enabled_debug = true;
+#endif
 	g->mm.bypass_smmu = platform->bypass_smmu;
 	g->mm.disable_bigpage = platform->disable_bigpage;