gpu: nvgpu: Move Linux files away from common

Move all Linux source code files to drivers/gpu/nvgpu/os/linux from
drivers/gpu/nvgpu/common/linux. This changes the meaning of common
to be OS independent.

JIRA NVGPU-598
JIRA NVGPU-601

Change-Id: Ib7f2a43d3688bb0d0b7dcc48469a6783fd988ce9
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1747714
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

124 files changed, 146 insertions, 133 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 5c7bb767..42d9855f 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -30,39 +30,118 @@ nvgpu-y += common/bus/bus_gk20a.o \
         common/ptimer/ptimer.o \
         common/ptimer/ptimer_gk20a.o
 
+# Linux specific parts of nvgpu.
+nvgpu-y += \
+        os/linux/kmem.o \
+        os/linux/timers.o \
+        os/linux/ioctl.o \
+        os/linux/ioctl_ctrl.o \
+        os/linux/ioctl_as.o \
+        os/linux/ioctl_channel.o \
+        os/linux/ioctl_tsg.o \
+        os/linux/ioctl_dbg.o \
+        os/linux/ioctl_clk_arb.o \
+        os/linux/log.o \
+        os/linux/cond.o \
+        os/linux/nvgpu_mem.o \
+        os/linux/dma.o \
+        os/linux/driver_common.o \
+        os/linux/firmware.o \
+        os/linux/thread.o \
+        os/linux/vm.o \
+        os/linux/intr.o \
+        os/linux/sysfs.o \
+        os/linux/io.o \
+        os/linux/io_usermode.o \
+        os/linux/rwsem.o \
+        os/linux/comptags.o \
+        os/linux/dmabuf.o \
+        os/linux/sched.o \
+        os/linux/channel.o \
+        os/linux/ce2.o \
+        os/linux/sim.o \
+        os/linux/sim_pci.o \
+        os/linux/os_sched.o \
+        os/linux/nvlink.o \
+        os/linux/dt.o
+
+nvgpu-$(CONFIG_GK20A_VIDMEM) += \
+        os/linux/vidmem.o
+
+nvgpu-$(CONFIG_DEBUG_FS) += \
+        os/linux/debug.o \
+        os/linux/debug_gr.o \
+        os/linux/debug_fifo.o \
+        os/linux/debug_ce.o \
+        os/linux/debug_pmu.o \
+        os/linux/debug_sched.o \
+        os/linux/debug_allocator.o \
+        os/linux/debug_hal.o \
+        os/linux/debug_clk.o \
+        os/linux/debug_xve.o
+
+ifeq ($(CONFIG_NVGPU_TRACK_MEM_USAGE),y)
+nvgpu-$(CONFIG_DEBUG_FS) += \
+        os/linux/debug_kmem.o
+endif
+
+nvgpu-$(CONFIG_GK20A_CTXSW_TRACE) += \
+        os/linux/ctxsw_trace.o
+
+nvgpu-$(CONFIG_TEGRA_GK20A) += \
+        os/linux/module.o \
+        os/linux/module_usermode.o \
+        os/linux/soc.o \
+        os/linux/fuse.o \
+        os/linux/platform_ecc_sysfs.o \
+        os/linux/platform_gk20a_tegra.o \
+        os/linux/platform_gp10b_tegra.o \
+        os/linux/platform_gv11b_tegra.o
+
+nvgpu-$(CONFIG_SYNC) += \
+        os/linux/sync_sema_android.o \
+        os/linux/os_fence_android.o \
+        os/linux/os_fence_android_sema.o
+
+ifeq ($(CONFIG_TEGRA_GK20A_NVHOST), y)
+nvgpu-$(CONFIG_SYNC) += \
+        os/linux/os_fence_android_syncpt.o
+endif
+
+nvgpu-$(CONFIG_GK20A_PCI) += \
+        os/linux/pci.o \
+        os/linux/pci_usermode.o
+
+nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += \
+        os/linux/nvhost.o
+
+nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
+        os/linux/vgpu/platform_vgpu_tegra.o \
+        os/linux/vgpu/fecs_trace_vgpu.o \
+        os/linux/vgpu/clk_vgpu.o \
+        os/linux/vgpu/sysfs_vgpu.o \
+        os/linux/vgpu/vgpu_ivc.o \
+        os/linux/vgpu/vgpu_ivm.o \
+        os/linux/vgpu/vgpu_linux.o \
+        os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.o
+
+nvgpu-$(CONFIG_COMMON_CLK) += \
+        os/linux/clk.o
+
+nvgpu-$(CONFIG_GK20A_DEVFREQ) += \
+        os/linux/scale.o
+
+nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \
+        os/linux/cde.o \
+        os/linux/cde_gm20b.o \
+        os/linux/cde_gp10b.o
+
+ifeq ($(CONFIG_DEBUG_FS),y)
+nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \
+        os/linux/debug_cde.o
+endif
+
 nvgpu-y += \
-        common/linux/kmem.o \
-        common/linux/timers.o \
-        common/linux/ioctl.o \
-        common/linux/ioctl_ctrl.o \
-        common/linux/ioctl_as.o \
-        common/linux/ioctl_channel.o \
-        common/linux/ioctl_tsg.o \
-        common/linux/ioctl_dbg.o \
-        common/linux/ioctl_clk_arb.o \
-        common/linux/log.o \
-        common/linux/cond.o \
-        common/linux/nvgpu_mem.o \
-        common/linux/dma.o \
-        common/linux/driver_common.o \
-        common/linux/firmware.o \
-        common/linux/thread.o \
-        common/linux/vm.o \
-        common/linux/intr.o \
-        common/linux/sysfs.o \
-        common/linux/io.o \
-        common/linux/io_usermode.o \
-        common/linux/rwsem.o \
-        common/linux/comptags.o \
-        common/linux/dmabuf.o \
-        common/linux/sched.o \
-        common/linux/channel.o \
-        common/linux/ce2.o \
-        common/linux/sim.o \
-        common/linux/sim_pci.o \
-        common/linux/os_sched.o \
-        common/linux/nvlink.o \
-        common/linux/dt.o \
         common/mm/nvgpu_allocator.o \
         common/mm/bitmap_allocator.o \
         common/mm/buddy_allocator.o \
@@ -138,51 +217,7 @@ nvgpu-y += \
         boardobj/boardobjgrp_e32.o
 
 nvgpu-$(CONFIG_GK20A_VIDMEM) += \
-        common/mm/vidmem.o \
-        common/linux/vidmem.o
-
-nvgpu-$(CONFIG_DEBUG_FS) += \
-        common/linux/debug.o \
-        common/linux/debug_gr.o \
-        common/linux/debug_fifo.o \
-        common/linux/debug_ce.o \
-        common/linux/debug_pmu.o \
-        common/linux/debug_sched.o \
-        common/linux/debug_allocator.o \
-        common/linux/debug_hal.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_GK20A_CTXSW_TRACE) += \
-        common/linux/ctxsw_trace.o
-
-nvgpu-$(CONFIG_TEGRA_GK20A) += \
-        common/linux/module.o \
-        common/linux/module_usermode.o \
-        common/linux/soc.o \
-        common/linux/fuse.o \
-        common/linux/platform_ecc_sysfs.o \
-        common/linux/platform_gk20a_tegra.o \
-        common/linux/platform_gp10b_tegra.o \
-        common/linux/platform_gv11b_tegra.o
-
-nvgpu-$(CONFIG_SYNC) += common/linux/sync_sema_android.o \
-                common/linux/os_fence_android.o \
-                common/linux/os_fence_android_sema.o
-
-ifeq ($(CONFIG_TEGRA_GK20A_NVHOST), y)
-nvgpu-$(CONFIG_SYNC) += common/linux/os_fence_android_syncpt.o
-endif
-
-nvgpu-$(CONFIG_GK20A_PCI) += common/linux/pci.o \
-        common/linux/pci_usermode.o \
-
-nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost.o
+        common/mm/vidmem.o
 
 nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
         vgpu/ltc_vgpu.o \
@@ -205,20 +240,6 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
         vgpu/gv11b/vgpu_fifo_gv11b.o \
         vgpu/gv11b/vgpu_subctx_gv11b.o \
         vgpu/gv11b/vgpu_tsg_gv11b.o \
-        common/linux/vgpu/platform_vgpu_tegra.o \
-        common/linux/vgpu/fecs_trace_vgpu.o \
-        common/linux/vgpu/clk_vgpu.o \
-        common/linux/vgpu/sysfs_vgpu.o \
-        common/linux/vgpu/vgpu_ivc.o \
-        common/linux/vgpu/vgpu_ivm.o \
-        common/linux/vgpu/vgpu_linux.o \
-        common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.o
-
-nvgpu-$(CONFIG_COMMON_CLK) += \
-        common/linux/clk.o
-
-nvgpu-$(CONFIG_GK20A_DEVFREQ) += \
-        common/linux/scale.o
 
 nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \
         gk20a/css_gr_gk20a.o
@@ -316,13 +337,3 @@ nvgpu-y += \
         therm/thrmpmu.o \
         lpwr/rppg.o \
         lpwr/lpwr.o
-
-nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \
-        common/linux/cde.o \
-        common/linux/cde_gm20b.o \
-        common/linux/cde_gp10b.o
-
-ifeq ($(CONFIG_DEBUG_FS),y)
-nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \
-        common/linux/debug_cde.o
-endif
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index 117920da..7e0aee11 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -41,7 +41,7 @@
 #include "fecs_trace_gk20a.h"
 #include "gk20a.h"
 #include "gr_gk20a.h"
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 
 #include <nvgpu/log.h>
 
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 057527a9..07e281a5 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 #endif
 
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
index 074aec92..4ea9e6f6 100644
--- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -28,7 +28,7 @@
 #include "gk20a/gk20a.h"
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 #endif
 #include "gp106/mclk_gp106.h"
 
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index b3862abe..b1f6fefb 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -27,7 +27,7 @@
 
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 #endif
 
 #include <nvgpu/hw/gp106/hw_therm_gp106.h>
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
index ba6012ec..7d50d222 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
@@ -25,6 +25,8 @@
 
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
 
+#include <nvgpu/types.h>
+
 struct nvgpu_nvhost_dev;
 struct gk20a;
 struct sync_pt;
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c
index 32b333f1..32b333f1 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/os/linux/cde.c
diff --git a/drivers/gpu/nvgpu/common/linux/cde.h b/drivers/gpu/nvgpu/os/linux/cde.h
index 5928b624..5928b624 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.h
+++ b/drivers/gpu/nvgpu/os/linux/cde.h
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gm20b.c b/drivers/gpu/nvgpu/os/linux/cde_gm20b.c
index 1cd15c54..1cd15c54 100644
--- a/drivers/gpu/nvgpu/common/linux/cde_gm20b.c
+++ b/drivers/gpu/nvgpu/os/linux/cde_gm20b.c
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gm20b.h b/drivers/gpu/nvgpu/os/linux/cde_gm20b.h
index 640d6ab6..640d6ab6 100644
--- a/drivers/gpu/nvgpu/common/linux/cde_gm20b.h
+++ b/drivers/gpu/nvgpu/os/linux/cde_gm20b.h
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gp10b.c b/drivers/gpu/nvgpu/os/linux/cde_gp10b.c
index 5c0e79a7..5c0e79a7 100644
--- a/drivers/gpu/nvgpu/common/linux/cde_gp10b.c
+++ b/drivers/gpu/nvgpu/os/linux/cde_gp10b.c
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gp10b.h b/drivers/gpu/nvgpu/os/linux/cde_gp10b.h
index 52e9f292..52e9f292 100644
--- a/drivers/gpu/nvgpu/common/linux/cde_gp10b.h
+++ b/drivers/gpu/nvgpu/os/linux/cde_gp10b.h
diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/os/linux/ce2.c
index 165f33db..165f33db 100644
--- a/drivers/gpu/nvgpu/common/linux/ce2.c
+++ b/drivers/gpu/nvgpu/os/linux/ce2.c
diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/os/linux/channel.c
index 7810bc21..7810bc21 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/os/linux/channel.c
diff --git a/drivers/gpu/nvgpu/common/linux/channel.h b/drivers/gpu/nvgpu/os/linux/channel.h
index 4a58b10c..4a58b10c 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.h
+++ b/drivers/gpu/nvgpu/os/linux/channel.h
diff --git a/drivers/gpu/nvgpu/common/linux/clk.c b/drivers/gpu/nvgpu/os/linux/clk.c
index 414b17c4..414b17c4 100644
--- a/drivers/gpu/nvgpu/common/linux/clk.c
+++ b/drivers/gpu/nvgpu/os/linux/clk.c
diff --git a/drivers/gpu/nvgpu/common/linux/clk.h b/drivers/gpu/nvgpu/os/linux/clk.h
index 614a7fd7..614a7fd7 100644
--- a/drivers/gpu/nvgpu/common/linux/clk.h
+++ b/drivers/gpu/nvgpu/os/linux/clk.h
diff --git a/drivers/gpu/nvgpu/common/linux/comptags.c b/drivers/gpu/nvgpu/os/linux/comptags.c
index 353f6363..353f6363 100644
--- a/drivers/gpu/nvgpu/common/linux/comptags.c
+++ b/drivers/gpu/nvgpu/os/linux/comptags.c
diff --git a/drivers/gpu/nvgpu/common/linux/cond.c b/drivers/gpu/nvgpu/os/linux/cond.c
index 633c34fd..633c34fd 100644
--- a/drivers/gpu/nvgpu/common/linux/cond.c
+++ b/drivers/gpu/nvgpu/os/linux/cond.c
diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c
index a335988a..a335988a 100644
--- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c
+++ b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c
diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.h b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.h
index 88ca7f25..88ca7f25 100644
--- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.h
+++ b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/os/linux/debug.c
index 8738f3e7..8738f3e7 100644
--- a/drivers/gpu/nvgpu/common/linux/debug.c
+++ b/drivers/gpu/nvgpu/os/linux/debug.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_allocator.c b/drivers/gpu/nvgpu/os/linux/debug_allocator.c
index d63a9030..d63a9030 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_allocator.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_allocator.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_allocator.h b/drivers/gpu/nvgpu/os/linux/debug_allocator.h
index 1b21cfc5..1b21cfc5 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_allocator.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_allocator.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_cde.c b/drivers/gpu/nvgpu/os/linux/debug_cde.c
index f0afa6ee..f0afa6ee 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_cde.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_cde.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_cde.h b/drivers/gpu/nvgpu/os/linux/debug_cde.h
index 4895edd6..4895edd6 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_cde.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_cde.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_ce.c b/drivers/gpu/nvgpu/os/linux/debug_ce.c
index cea0bb47..cea0bb47 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_ce.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_ce.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_ce.h b/drivers/gpu/nvgpu/os/linux/debug_ce.h
index 2a8750c4..2a8750c4 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_ce.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_ce.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_clk.c b/drivers/gpu/nvgpu/os/linux/debug_clk.c
index 2484d44b..2484d44b 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_clk.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_clk.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.c b/drivers/gpu/nvgpu/os/linux/debug_fifo.c
index 2b5674c0..2b5674c0 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_fifo.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_fifo.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.h b/drivers/gpu/nvgpu/os/linux/debug_fifo.h
index 46ac853e..46ac853e 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_fifo.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_fifo.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_gr.c b/drivers/gpu/nvgpu/os/linux/debug_gr.c
index d54c6d63..d54c6d63 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_gr.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_gr.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_gr.h b/drivers/gpu/nvgpu/os/linux/debug_gr.h
index 4b46acbb..4b46acbb 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_gr.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_gr.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_hal.c b/drivers/gpu/nvgpu/os/linux/debug_hal.c
index 031e335e..031e335e 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_hal.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_hal.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_hal.h b/drivers/gpu/nvgpu/os/linux/debug_hal.h
index eee6f234..eee6f234 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_hal.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_hal.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_kmem.c b/drivers/gpu/nvgpu/os/linux/debug_kmem.c
index a0c7d47d..a0c7d47d 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_kmem.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_kmem.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_kmem.h b/drivers/gpu/nvgpu/os/linux/debug_kmem.h
index 44322b53..44322b53 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_kmem.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_kmem.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_pmu.c b/drivers/gpu/nvgpu/os/linux/debug_pmu.c
index f4ed992d..f4ed992d 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_pmu.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_pmu.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_pmu.h b/drivers/gpu/nvgpu/os/linux/debug_pmu.h
index c4e3243d..c4e3243d 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_pmu.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_pmu.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_sched.c b/drivers/gpu/nvgpu/os/linux/debug_sched.c
index 5b7cbddf..5b7cbddf 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_sched.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_sched.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_sched.h b/drivers/gpu/nvgpu/os/linux/debug_sched.h
index 34a8f55f..34a8f55f 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_sched.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_sched.h
diff --git a/drivers/gpu/nvgpu/common/linux/debug_xve.c b/drivers/gpu/nvgpu/os/linux/debug_xve.c
index 743702a2..743702a2 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_xve.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_xve.c
diff --git a/drivers/gpu/nvgpu/common/linux/debug_xve.h b/drivers/gpu/nvgpu/os/linux/debug_xve.h
index f3b1ac54..f3b1ac54 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_xve.h
+++ b/drivers/gpu/nvgpu/os/linux/debug_xve.h
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/os/linux/dma.c
index f513dcd6..f513dcd6 100644
--- a/drivers/gpu/nvgpu/common/linux/dma.c
+++ b/drivers/gpu/nvgpu/os/linux/dma.c
diff --git a/drivers/gpu/nvgpu/common/linux/dmabuf.c b/drivers/gpu/nvgpu/os/linux/dmabuf.c
index 129739f0..129739f0 100644
--- a/drivers/gpu/nvgpu/common/linux/dmabuf.c
+++ b/drivers/gpu/nvgpu/os/linux/dmabuf.c
diff --git a/drivers/gpu/nvgpu/common/linux/dmabuf.h b/drivers/gpu/nvgpu/os/linux/dmabuf.h
index 8399eaaf..8399eaaf 100644
--- a/drivers/gpu/nvgpu/common/linux/dmabuf.h
+++ b/drivers/gpu/nvgpu/os/linux/dmabuf.h
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c
index 8f33c5d2..8f33c5d2 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/os/linux/driver_common.c
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.h b/drivers/gpu/nvgpu/os/linux/driver_common.h
index 6f42f775..6f42f775 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.h
+++ b/drivers/gpu/nvgpu/os/linux/driver_common.h
diff --git a/drivers/gpu/nvgpu/common/linux/dt.c b/drivers/gpu/nvgpu/os/linux/dt.c
index 88e391e3..88e391e3 100644
--- a/drivers/gpu/nvgpu/common/linux/dt.c
+++ b/drivers/gpu/nvgpu/os/linux/dt.c
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/os/linux/firmware.c
index 9a4dc653..9a4dc653 100644
--- a/drivers/gpu/nvgpu/common/linux/firmware.c
+++ b/drivers/gpu/nvgpu/os/linux/firmware.c
diff --git a/drivers/gpu/nvgpu/common/linux/fuse.c b/drivers/gpu/nvgpu/os/linux/fuse.c
index 27851f92..27851f92 100644
--- a/drivers/gpu/nvgpu/common/linux/fuse.c
+++ b/drivers/gpu/nvgpu/os/linux/fuse.c
diff --git a/drivers/gpu/nvgpu/common/linux/intr.c b/drivers/gpu/nvgpu/os/linux/intr.c
index 7ffc7e87..7ffc7e87 100644
--- a/drivers/gpu/nvgpu/common/linux/intr.c
+++ b/drivers/gpu/nvgpu/os/linux/intr.c
diff --git a/drivers/gpu/nvgpu/common/linux/intr.h b/drivers/gpu/nvgpu/os/linux/intr.h
index d43cdccb..d43cdccb 100644
--- a/drivers/gpu/nvgpu/common/linux/intr.h
+++ b/drivers/gpu/nvgpu/os/linux/intr.h
diff --git a/drivers/gpu/nvgpu/common/linux/io.c b/drivers/gpu/nvgpu/os/linux/io.c
index c06512a5..c06512a5 100644
--- a/drivers/gpu/nvgpu/common/linux/io.c
+++ b/drivers/gpu/nvgpu/os/linux/io.c
diff --git a/drivers/gpu/nvgpu/common/linux/io_usermode.c b/drivers/gpu/nvgpu/os/linux/io_usermode.c
index a7b728dd..ce7c9e75 100644
--- a/drivers/gpu/nvgpu/common/linux/io_usermode.c
+++ b/drivers/gpu/nvgpu/os/linux/io_usermode.c
@@ -14,7 +14,7 @@
 #include <nvgpu/io.h>
 #include <nvgpu/types.h>
 
-#include "common/linux/os_linux.h"
+#include "os_linux.h"
 #include "gk20a/gk20a.h"
 
 #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h>
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.c b/drivers/gpu/nvgpu/os/linux/ioctl.c
index 359e5103..359e5103 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl.c
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.h b/drivers/gpu/nvgpu/os/linux/ioctl.h
index 7bf16711..7bf16711 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl.h
+++ b/drivers/gpu/nvgpu/os/linux/ioctl.h
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/os/linux/ioctl_as.c
index 47f612cc..47f612cc 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.c
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.h b/drivers/gpu/nvgpu/os/linux/ioctl_as.h
index b3de3782..b3de3782 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_as.h
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.h
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
index b04bb9de..b04bb9de 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h b/drivers/gpu/nvgpu/os/linux/ioctl_channel.h
index 48cff1ea..48cff1ea 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.h
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c
index a7c6a607..501b5f93 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c
@@ -43,7 +43,7 @@
 #include "volt/volt.h"
 
 #ifdef CONFIG_DEBUG_FS
-#include "common/linux/os_linux.h"
+#include "os_linux.h"
 #endif
 
 static int nvgpu_clk_arb_release_completion_dev(struct inode *inode,
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
index 73a8131d..73a8131d 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.h b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.h
index 8b4a5e59..8b4a5e59 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.h
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.h
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
index 31e7e2cb..31e7e2cb 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.h b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.h
index bd76045b..bd76045b 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.h
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.h
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
index 4ef99ded..4ef99ded 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.h b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.h
index 67399fd4..67399fd4 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.h
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.h
diff --git a/drivers/gpu/nvgpu/common/linux/kmem.c b/drivers/gpu/nvgpu/os/linux/kmem.c
index 10946a08..10946a08 100644
--- a/drivers/gpu/nvgpu/common/linux/kmem.c
+++ b/drivers/gpu/nvgpu/os/linux/kmem.c
diff --git a/drivers/gpu/nvgpu/common/linux/kmem_priv.h b/drivers/gpu/nvgpu/os/linux/kmem_priv.h
index a41762af..a41762af 100644
--- a/drivers/gpu/nvgpu/common/linux/kmem_priv.h
+++ b/drivers/gpu/nvgpu/os/linux/kmem_priv.h
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/os/linux/log.c
index ca29e0f3..ca29e0f3 100644
--- a/drivers/gpu/nvgpu/common/linux/log.c
+++ b/drivers/gpu/nvgpu/os/linux/log.c
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index af71cc81..af71cc81 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
diff --git a/drivers/gpu/nvgpu/common/linux/module.h b/drivers/gpu/nvgpu/os/linux/module.h
index ab4bca03..ab4bca03 100644
--- a/drivers/gpu/nvgpu/common/linux/module.h
+++ b/drivers/gpu/nvgpu/os/linux/module.h
diff --git a/drivers/gpu/nvgpu/common/linux/module_usermode.c b/drivers/gpu/nvgpu/os/linux/module_usermode.c
index 61cb4e87..ea01c1b2 100644
--- a/drivers/gpu/nvgpu/common/linux/module_usermode.c
+++ b/drivers/gpu/nvgpu/os/linux/module_usermode.c
@@ -18,7 +18,7 @@
 
 #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h>
 
-#include "common/linux/os_linux.h"
+#include "os_linux.h"
 
 /*
  * Locks out the driver from accessing GPU registers. This prevents access to
diff --git a/drivers/gpu/nvgpu/common/linux/module_usermode.h b/drivers/gpu/nvgpu/os/linux/module_usermode.h
index b17053ca..b17053ca 100644
--- a/drivers/gpu/nvgpu/common/linux/module_usermode.h
+++ b/drivers/gpu/nvgpu/os/linux/module_usermode.h
diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c
index 93925803..93925803 100644
--- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost.c b/drivers/gpu/nvgpu/os/linux/nvhost.c
index 6ab60248..6ab60248 100644
--- a/drivers/gpu/nvgpu/common/linux/nvhost.c
+++ b/drivers/gpu/nvgpu/os/linux/nvhost.c
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost_priv.h b/drivers/gpu/nvgpu/os/linux/nvhost_priv.h
index c03390a7..c03390a7 100644
--- a/drivers/gpu/nvgpu/common/linux/nvhost_priv.h
+++ b/drivers/gpu/nvgpu/os/linux/nvhost_priv.h
diff --git a/drivers/gpu/nvgpu/common/linux/nvlink.c b/drivers/gpu/nvgpu/os/linux/nvlink.c
index c93514c0..c93514c0 100644
--- a/drivers/gpu/nvgpu/common/linux/nvlink.c
+++ b/drivers/gpu/nvgpu/os/linux/nvlink.c
diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android.c b/drivers/gpu/nvgpu/os/linux/os_fence_android.c
index 9be8c6c0..9be8c6c0 100644
--- a/drivers/gpu/nvgpu/common/linux/os_fence_android.c
+++ b/drivers/gpu/nvgpu/os/linux/os_fence_android.c
diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android_sema.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c
index 25832417..25832417 100644
--- a/drivers/gpu/nvgpu/common/linux/os_fence_android_sema.c
+++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c
diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c
index d7a72fcd..d7a72fcd 100644
--- a/drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c
+++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c
diff --git a/drivers/gpu/nvgpu/common/linux/os_linux.h b/drivers/gpu/nvgpu/os/linux/os_linux.h
index 4dcce322..4dcce322 100644
--- a/drivers/gpu/nvgpu/common/linux/os_linux.h
+++ b/drivers/gpu/nvgpu/os/linux/os_linux.h
diff --git a/drivers/gpu/nvgpu/common/linux/os_sched.c b/drivers/gpu/nvgpu/os/linux/os_sched.c
index 586b35eb..586b35eb 100644
--- a/drivers/gpu/nvgpu/common/linux/os_sched.c
+++ b/drivers/gpu/nvgpu/os/linux/os_sched.c
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c
index 1011b441..1011b441 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/os/linux/pci.c
diff --git a/drivers/gpu/nvgpu/common/linux/pci.h b/drivers/gpu/nvgpu/os/linux/pci.h
index cc6b77b1..cc6b77b1 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.h
+++ b/drivers/gpu/nvgpu/os/linux/pci.h
diff --git a/drivers/gpu/nvgpu/common/linux/pci_usermode.c b/drivers/gpu/nvgpu/os/linux/pci_usermode.c
index f474bd10..270b834b 100644
--- a/drivers/gpu/nvgpu/common/linux/pci_usermode.c
+++ b/drivers/gpu/nvgpu/os/linux/pci_usermode.c
@@ -15,7 +15,7 @@
 
 #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h>
 
-#include "common/linux/os_linux.h"
+#include "os_linux.h"
 
 void nvgpu_pci_init_usermode_support(struct nvgpu_os_linux *l)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/pci_usermode.h b/drivers/gpu/nvgpu/os/linux/pci_usermode.h
index 25a08d28..25a08d28 100644
--- a/drivers/gpu/nvgpu/common/linux/pci_usermode.h
+++ b/drivers/gpu/nvgpu/os/linux/pci_usermode.h
diff --git a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.c b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.c
index 0fe1c8d2..2a6ace37 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.c
@@ -26,7 +26,7 @@
 
 #include "platform_gk20a.h"
 #include "platform_gk20a_tegra.h"
-#include "gp10b/platform_gp10b.h"
+#include "platform_gp10b.h"
 #include "platform_gp10b_tegra.h"
 #include "platform_ecc_sysfs.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.h b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.h
index d29f7bd3..d29f7bd3 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.h
+++ b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.h
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
index 9a99b7fe..9a99b7fe 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
index af55e5b6..af55e5b6 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.h
index f7d50406..f7d50406 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.h
diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b.h b/drivers/gpu/nvgpu/os/linux/platform_gp10b.h
index d256d126..d256d126 100644
--- a/drivers/gpu/nvgpu/gp10b/platform_gp10b.h
+++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b.h
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c
index fce16653..5cb82687 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c
@@ -43,7 +43,7 @@
 #include "platform_gk20a.h"
 #include "platform_ecc_sysfs.h"
 #include "platform_gk20a_tegra.h"
-#include "gp10b/platform_gp10b.h"
+#include "platform_gp10b.h"
 #include "platform_gp10b_tegra.h"
 #include "scale.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.h
index 6de90275..6de90275 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h
+++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.h
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c
index bf66762b..d62e7932 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c
@@ -37,7 +37,7 @@
 #include "clk.h"
 #include "scale.h"
 
-#include "gp10b/platform_gp10b.h"
+#include "platform_gp10b.h"
 #include "platform_gp10b_tegra.h"
 #include "platform_ecc_sysfs.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/rwsem.c b/drivers/gpu/nvgpu/os/linux/rwsem.c
index 297ddf11..297ddf11 100644
--- a/drivers/gpu/nvgpu/common/linux/rwsem.c
+++ b/drivers/gpu/nvgpu/os/linux/rwsem.c
diff --git a/drivers/gpu/nvgpu/common/linux/scale.c b/drivers/gpu/nvgpu/os/linux/scale.c
index 84ac1cfd..84ac1cfd 100644
--- a/drivers/gpu/nvgpu/common/linux/scale.c
+++ b/drivers/gpu/nvgpu/os/linux/scale.c
diff --git a/drivers/gpu/nvgpu/common/linux/scale.h b/drivers/gpu/nvgpu/os/linux/scale.h
index c1e6fe86..c1e6fe86 100644
--- a/drivers/gpu/nvgpu/common/linux/scale.h
+++ b/drivers/gpu/nvgpu/os/linux/scale.h
diff --git a/drivers/gpu/nvgpu/common/linux/sched.c b/drivers/gpu/nvgpu/os/linux/sched.c
index 2ad5aabf..2ad5aabf 100644
--- a/drivers/gpu/nvgpu/common/linux/sched.c
+++ b/drivers/gpu/nvgpu/os/linux/sched.c
diff --git a/drivers/gpu/nvgpu/common/linux/sched.h b/drivers/gpu/nvgpu/os/linux/sched.h
index a699bbea..a699bbea 100644
--- a/drivers/gpu/nvgpu/common/linux/sched.h
+++ b/drivers/gpu/nvgpu/os/linux/sched.h
diff --git a/drivers/gpu/nvgpu/common/linux/sim.c b/drivers/gpu/nvgpu/os/linux/sim.c
index 8e964f39..8e964f39 100644
--- a/drivers/gpu/nvgpu/common/linux/sim.c
+++ b/drivers/gpu/nvgpu/os/linux/sim.c
diff --git a/drivers/gpu/nvgpu/common/linux/sim_pci.c b/drivers/gpu/nvgpu/os/linux/sim_pci.c
index d37767b7..d37767b7 100644
--- a/drivers/gpu/nvgpu/common/linux/sim_pci.c
+++ b/drivers/gpu/nvgpu/os/linux/sim_pci.c
diff --git a/drivers/gpu/nvgpu/common/linux/soc.c b/drivers/gpu/nvgpu/os/linux/soc.c
index 1b27d6f1..1b27d6f1 100644
--- a/drivers/gpu/nvgpu/common/linux/soc.c
+++ b/drivers/gpu/nvgpu/os/linux/soc.c
diff --git a/drivers/gpu/nvgpu/common/linux/sync_sema_android.c b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c
index fad21351..4dd10e6e 100644
--- a/drivers/gpu/nvgpu/common/linux/sync_sema_android.c
+++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c
@@ -26,7 +26,7 @@
 #include <nvgpu/semaphore.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/kref.h>
-#include "../common/linux/channel.h"
+#include "../linux/channel.h"
 
 #include "../drivers/staging/android/sync.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/sync_sema_android.h b/drivers/gpu/nvgpu/os/linux/sync_sema_android.h
index 4fca7bed..4fca7bed 100644
--- a/drivers/gpu/nvgpu/common/linux/sync_sema_android.h
+++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.h
diff --git a/drivers/gpu/nvgpu/common/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c
index e5995bb8..e5995bb8 100644
--- a/drivers/gpu/nvgpu/common/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/os/linux/sysfs.c
diff --git a/drivers/gpu/nvgpu/common/linux/sysfs.h b/drivers/gpu/nvgpu/os/linux/sysfs.h
index 80925844..80925844 100644
--- a/drivers/gpu/nvgpu/common/linux/sysfs.h
+++ b/drivers/gpu/nvgpu/os/linux/sysfs.h
diff --git a/drivers/gpu/nvgpu/common/linux/thread.c b/drivers/gpu/nvgpu/os/linux/thread.c
index 92c556f2..92c556f2 100644
--- a/drivers/gpu/nvgpu/common/linux/thread.c
+++ b/drivers/gpu/nvgpu/os/linux/thread.c
diff --git a/drivers/gpu/nvgpu/common/linux/timers.c b/drivers/gpu/nvgpu/os/linux/timers.c
index d1aa641f..d1aa641f 100644
--- a/drivers/gpu/nvgpu/common/linux/timers.c
+++ b/drivers/gpu/nvgpu/os/linux/timers.c
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c
index 0858e6b1..9f6017d3 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c
@@ -21,7 +21,7 @@
 #include "gk20a/gk20a.h"
 #include "clk_vgpu.h"
 #include "ctrl/ctrlclk.h"
-#include "common/linux/platform_gk20a.h"
+#include "os/linux/platform_gk20a.h"
 
 static unsigned long
 vgpu_freq_table[TEGRA_VGPU_GPU_FREQ_TABLE_SIZE];
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.h b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.h
index 8d477643..8d477643 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.h
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.h
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c
index 499a8eb4..6339aef9 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c
@@ -25,7 +25,7 @@
 #include <nvgpu/vgpu/vgpu.h>
 
 #include "gk20a/gk20a.h"
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 #include "vgpu/fecs_trace_vgpu.h"
 
 struct vgpu_fecs_trace {
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
index 054b019b..66911626 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
@@ -14,14 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gk20a/gk20a.h"
-#include "common/linux/vgpu/clk_vgpu.h"
-#include "common/linux/platform_gk20a.h"
-#include "common/linux/os_linux.h"
+#include <linux/platform_device.h>
 
 #include <nvgpu/nvhost.h>
 
-#include <linux/platform_device.h>
+#include "gk20a/gk20a.h"
+#include "os/linux/vgpu/clk_vgpu.h"
+#include "os/linux/platform_gk20a.h"
+#include "os/linux/os_linux.h"
 
 static int gv11b_vgpu_probe(struct device *dev)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c
index 830b04ac..e4819e7d 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/platform_vgpu_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <nvgpu/nvhost.h>
+
 #include "gk20a/gk20a.h"
-#include "common/linux/platform_gk20a.h"
+#include "os/linux/platform_gk20a.h"
 #include "clk_vgpu.h"
 
-#include <nvgpu/nvhost.h>
-
 static int gk20a_tegra_probe(struct device *dev)
 {
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/sysfs_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c
index 5a8ed9fd..57aad4b4 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/sysfs_vgpu.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c
@@ -17,7 +17,7 @@
 #include <linux/device.h>
 #include <nvgpu/vgpu/vgpu.h>
 
-#include "common/linux/platform_gk20a.h"
+#include "os/linux/platform_gk20a.h"
 
 static ssize_t vgpu_load_show(struct device *dev,
                               struct device_attribute *attr,
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivc.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivc.c
index b28b5013..950f0d49 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivc.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivc.c
@@ -17,7 +17,7 @@
 #include <nvgpu/types.h>
 #include <linux/tegra_gr_comm.h>
 
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 
 int vgpu_ivc_init(struct gk20a *g, u32 elems,
                 const size_t *queue_sizes, u32 queue_start, u32 num_queues)
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivm.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivm.c
index 90089de8..bbd444da 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivm.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivm.c
@@ -18,7 +18,7 @@
 
 #include <linux/tegra-ivc.h>
 
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 
 struct tegra_hv_ivm_cookie *vgpu_ivm_mempool_reserve(unsigned int id)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
index 0d224eb9..a7612e54 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
@@ -40,12 +40,12 @@
 #include "gk20a/regops_gk20a.h"
 #include "gm20b/hal_gm20b.h"
 
-#include "common/linux/module.h"
-#include "common/linux/os_linux.h"
-#include "common/linux/ioctl.h"
-#include "common/linux/scale.h"
-#include "common/linux/driver_common.h"
-#include "common/linux/platform_gk20a.h"
+#include "os/linux/module.h"
+#include "os/linux/os_linux.h"
+#include "os/linux/ioctl.h"
+#include "os/linux/scale.h"
+#include "os/linux/driver_common.h"
+#include "os/linux/platform_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.h b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.h
index 38379cf2..38379cf2 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.h
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.h
diff --git a/drivers/gpu/nvgpu/common/linux/vidmem.c b/drivers/gpu/nvgpu/os/linux/vidmem.c
index 136d4a10..136d4a10 100644
--- a/drivers/gpu/nvgpu/common/linux/vidmem.c
+++ b/drivers/gpu/nvgpu/os/linux/vidmem.c
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/os/linux/vm.c
index baa77515..baa77515 100644
--- a/drivers/gpu/nvgpu/common/linux/vm.c
+++ b/drivers/gpu/nvgpu/os/linux/vm.c
diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c
index 2a9f9673..3d028c98 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgr.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgr.c
@@ -26,7 +26,7 @@
 
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
-#include "common/linux/os_linux.h"
+#include "os/linux/os_linux.h"
 #endif
 
 int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val)