diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 5c7bb767a..42d9855fe 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 117920dad..7e0aee115 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 057527a99..07e281a5d 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 074aec92a..4ea9e6f63 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 b3862abe2..b1f6fefb3 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 ba6012ec8..7d50d2224 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/cde.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/cde.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/cde_gm20b.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/cde_gm20b.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/cde_gp10b.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/cde_gp10b.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ce2.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/channel.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/channel.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/clk.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/clk.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/comptags.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/cond.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ctxsw_trace.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ctxsw_trace.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_allocator.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_allocator.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_cde.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_cde.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_ce.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_ce.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_clk.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_fifo.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_fifo.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_gr.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_gr.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_hal.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_hal.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_kmem.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_kmem.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_pmu.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_pmu.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_sched.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_sched.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_xve.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/debug_xve.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/dma.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/dmabuf.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/dmabuf.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/driver_common.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/driver_common.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/dt.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/firmware.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/fuse.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/intr.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/intr.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/io.c
rename to 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
similarity index 96%
rename from drivers/gpu/nvgpu/common/linux/io_usermode.c
rename to drivers/gpu/nvgpu/os/linux/io_usermode.c
index a7b728dd4..ce7c9e759 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_as.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_as.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_channel.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_channel.h
rename to 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
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c
rename to drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c
index a7c6a607a..501b5f930 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_ctrl.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_dbg.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_dbg.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/ioctl_tsg.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/kmem.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/kmem_priv.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/log.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/module.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/module.h
rename to 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
similarity index 98%
rename from drivers/gpu/nvgpu/common/linux/module_usermode.c
rename to drivers/gpu/nvgpu/os/linux/module_usermode.c
index 61cb4e872..ea01c1b29 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/module_usermode.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/nvhost.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/nvhost_priv.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/nvlink.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/os_fence_android.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/os_fence_android_sema.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/os_linux.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/os_sched.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/pci.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/pci.h
rename to 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
similarity index 95%
rename from drivers/gpu/nvgpu/common/linux/pci_usermode.c
rename to drivers/gpu/nvgpu/os/linux/pci_usermode.c
index f474bd101..270b834be 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/pci_usermode.h
rename to 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
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.c
rename to drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.c
index 0fe1c8d2c..2a6ace375 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/platform_gk20a.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/gp10b/platform_gp10b.h
rename to 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
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
rename to drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c
index fce166538..5cb826871 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h
rename to 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
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
rename to drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c
index bf66762b0..d62e7932f 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/rwsem.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/scale.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/scale.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/sched.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/sched.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/sim.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/sim_pci.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/soc.c
rename to 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
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/sync_sema_android.c
rename to drivers/gpu/nvgpu/os/linux/sync_sema_android.c
index fad213518..4dd10e6e2 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/sync_sema_android.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/sysfs.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/sysfs.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/thread.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/timers.c
rename to 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
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c
index 0858e6b18..9f6017d36 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.h
rename to 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
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c
index 499a8eb4a..6339aef92 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
similarity index 95%
rename from drivers/gpu/nvgpu/common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
index 054b019b2..669116266 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
similarity index 97%
rename from drivers/gpu/nvgpu/common/linux/vgpu/platform_vgpu_tegra.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c
index 830b04ac2..e4819e7dc 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 "gk20a/gk20a.h"
-#include "common/linux/platform_gk20a.h"
-#include "clk_vgpu.h"
-
 #include <nvgpu/nvhost.h>
 
+#include "gk20a/gk20a.h"
+#include "os/linux/platform_gk20a.h"
+#include "clk_vgpu.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
similarity index 97%
rename from drivers/gpu/nvgpu/common/linux/vgpu/sysfs_vgpu.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c
index 5a8ed9fd2..57aad4b40 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
similarity index 98%
rename from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivc.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivc.c
index b28b5013e..950f0d494 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
similarity index 97%
rename from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivm.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivm.c
index 90089de8d..bbd444da6 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
similarity index 97%
rename from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c
rename to drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
index 0d224eb9d..a7612e541 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.h
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/vidmem.c
rename to 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
similarity index 100%
rename from drivers/gpu/nvgpu/common/linux/vm.c
rename to drivers/gpu/nvgpu/os/linux/vm.c
diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c
index 2a9f96737..3d028c98b 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)