5 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
index d9316c7f..6a9d3811 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
@@ -15,6 +15,7 @@
 
 #include <linux/cdev.h>
 #include <linux/uaccess.h>
+#include <linux/fs.h>
 
 #include <nvgpu/log2.h>
 
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 0546658d..97e911b9 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -18,6 +18,7 @@
 #include <linux/cdev.h>
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
+#include <linux/fs.h>
 #include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/bitops.h>
diff --git a/drivers/gpu/nvgpu/common/linux/kmem.c b/drivers/gpu/nvgpu/common/linux/kmem.c
index 4fe68830..f38a5e78 100644
--- a/drivers/gpu/nvgpu/common/linux/kmem.c
+++ b/drivers/gpu/nvgpu/common/linux/kmem.c
@@ -479,6 +479,7 @@ static void print_histogram(struct nvgpu_mem_alloc_tracker *tracker,
         }
 }
 
+#ifdef CONFIG_DEBUG_FS
 /**
  * nvgpu_kmem_print_stats - Print kmem tracking stats.
  *
@@ -515,7 +516,6 @@ void nvgpu_kmem_print_stats(struct nvgpu_mem_alloc_tracker *tracker,
         unlock_tracker(tracker);
 }
 
-#if defined(CONFIG_DEBUG_FS)
 static int __kmem_tracking_show(struct seq_file *s, void *unused)
 {
         struct nvgpu_mem_alloc_tracker *tracker = s->private;
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 79d6bd5f..ebc25a26 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -615,9 +615,9 @@ static int gk20a_pm_unrailgate(struct device *dev)
 {
         struct gk20a_platform *platform = dev_get_drvdata(dev);
         int ret = 0;
+#ifdef CONFIG_DEBUG_FS
         struct gk20a *g = get_gk20a(dev);
 
-#ifdef CONFIG_DEBUG_FS
         g->pstats.last_rail_ungate_start = jiffies;
         if (g->pstats.railgating_cycle_count >= 1)
                 g->pstats.total_rail_gate_time_ms =
@@ -974,8 +974,10 @@ static int __exit gk20a_remove(struct platform_device *pdev)
 
         gk20a_user_deinit(dev, &nvgpu_class);
 
+#ifdef CONFIG_DEBUG_FS
         debugfs_remove_recursive(platform->debugfs);
         debugfs_remove_recursive(platform->debugfs_alias);
+#endif
 
         gk20a_remove_sysfs(dev);
 
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 0bad2b67..b4e6cb7c 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -463,8 +463,10 @@ static void nvgpu_pci_remove(struct pci_dev *pdev)
         gk20a_user_deinit(g->dev, &nvgpu_pci_class);
         gk20a_dbg(gpu_dbg_shutdown, "User de-init done.\b");
 
+#ifdef CONFIG_DEBUG_FS
         debugfs_remove_recursive(platform->debugfs);
         debugfs_remove_recursive(platform->debugfs_alias);
+#endif
 
         gk20a_remove_sysfs(g->dev);