26 files changed, 25 insertions, 25 deletions

diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 2d7efd98..7c6e7f7f 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -20,7 +20,31 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-srcs := common/mm/nvgpu_allocator.c \
+srcs := os/posix/nvgpu.c \
+        os/posix/bitmap.c \
+        os/posix/bug.c \
+        os/posix/log.c \
+        os/posix/kmem.c \
+        os/posix/io.c \
+        os/posix/posix-nvgpu_mem.c \
+        os/posix/dma.c \
+        os/posix/posix-vm.c \
+        os/posix/timers.c \
+        os/posix/posix-comptags.c \
+        os/posix/firmware.c \
+        os/posix/soc.c \
+        os/posix/rwsem.c \
+        os/posix/cond.c \
+        os/posix/thread.c \
+        os/posix/error_notifier.c \
+        os/posix/fuse.c \
+        os/posix/clk_arb.c \
+        os/posix/channel.c \
+        os/posix/tsg.c \
+        os/posix/nvlink.c \
+        os/posix/lock.c \
+        os/posix/stubs.c \
+        common/mm/nvgpu_allocator.c \
         common/mm/bitmap_allocator.c \
         common/mm/buddy_allocator.c \
         common/mm/page_allocator.c \
@@ -71,30 +95,6 @@ srcs :=	common/mm/nvgpu_allocator.c \
         common/pmu/pmu_pg.c \
         common/pmu/pmu_perfmon.c \
         common/pmu/pmu_debug.c \
-        common/posix/nvgpu.c \
-        common/posix/bitmap.c \
-        common/posix/bug.c \
-        common/posix/log.c \
-        common/posix/kmem.c \
-        common/posix/io.c \
-        common/posix/posix-nvgpu_mem.c \
-        common/posix/dma.c \
-        common/posix/posix-vm.c \
-        common/posix/timers.c \
-        common/posix/posix-comptags.c \
-        common/posix/firmware.c \
-        common/posix/soc.c \
-        common/posix/rwsem.c \
-        common/posix/cond.c \
-        common/posix/thread.c \
-        common/posix/error_notifier.c \
-        common/posix/fuse.c \
-        common/posix/clk_arb.c \
-        common/posix/channel.c \
-        common/posix/tsg.c \
-        common/posix/nvlink.c \
-        common/posix/lock.c \
-        common/posix/stubs.c \
         common/ptimer/ptimer.c \
         common/clock_gating/gm20b_gating_reglist.c \
         common/clock_gating/gp10b_gating_reglist.c \
diff --git a/drivers/gpu/nvgpu/common/posix/bitmap.c b/drivers/gpu/nvgpu/os/posix/bitmap.c
index f25f6e64..f25f6e64 100644
--- a/drivers/gpu/nvgpu/common/posix/bitmap.c
+++ b/drivers/gpu/nvgpu/os/posix/bitmap.c
diff --git a/drivers/gpu/nvgpu/common/posix/bug.c b/drivers/gpu/nvgpu/os/posix/bug.c
index 64f4a6f6..64f4a6f6 100644
--- a/drivers/gpu/nvgpu/common/posix/bug.c
+++ b/drivers/gpu/nvgpu/os/posix/bug.c
diff --git a/drivers/gpu/nvgpu/common/posix/channel.c b/drivers/gpu/nvgpu/os/posix/channel.c
index 05697159..05697159 100644
--- a/drivers/gpu/nvgpu/common/posix/channel.c
+++ b/drivers/gpu/nvgpu/os/posix/channel.c
diff --git a/drivers/gpu/nvgpu/common/posix/clk_arb.c b/drivers/gpu/nvgpu/os/posix/clk_arb.c
index 2214b37b..2214b37b 100644
--- a/drivers/gpu/nvgpu/common/posix/clk_arb.c
+++ b/drivers/gpu/nvgpu/os/posix/clk_arb.c
diff --git a/drivers/gpu/nvgpu/common/posix/cond.c b/drivers/gpu/nvgpu/os/posix/cond.c
index ca8a2c4a..ca8a2c4a 100644
--- a/drivers/gpu/nvgpu/common/posix/cond.c
+++ b/drivers/gpu/nvgpu/os/posix/cond.c
diff --git a/drivers/gpu/nvgpu/common/posix/dma.c b/drivers/gpu/nvgpu/os/posix/dma.c
index 95bb1a75..95bb1a75 100644
--- a/drivers/gpu/nvgpu/common/posix/dma.c
+++ b/drivers/gpu/nvgpu/os/posix/dma.c
diff --git a/drivers/gpu/nvgpu/common/posix/error_notifier.c b/drivers/gpu/nvgpu/os/posix/error_notifier.c
index 50b4f258..50b4f258 100644
--- a/drivers/gpu/nvgpu/common/posix/error_notifier.c
+++ b/drivers/gpu/nvgpu/os/posix/error_notifier.c
diff --git a/drivers/gpu/nvgpu/common/posix/firmware.c b/drivers/gpu/nvgpu/os/posix/firmware.c
index aedfef9f..aedfef9f 100644
--- a/drivers/gpu/nvgpu/common/posix/firmware.c
+++ b/drivers/gpu/nvgpu/os/posix/firmware.c
diff --git a/drivers/gpu/nvgpu/common/posix/fuse.c b/drivers/gpu/nvgpu/os/posix/fuse.c
index 09ec36dc..09ec36dc 100644
--- a/drivers/gpu/nvgpu/common/posix/fuse.c
+++ b/drivers/gpu/nvgpu/os/posix/fuse.c
diff --git a/drivers/gpu/nvgpu/common/posix/io.c b/drivers/gpu/nvgpu/os/posix/io.c
index 7bab8af6..7bab8af6 100644
--- a/drivers/gpu/nvgpu/common/posix/io.c
+++ b/drivers/gpu/nvgpu/os/posix/io.c
diff --git a/drivers/gpu/nvgpu/common/posix/kmem.c b/drivers/gpu/nvgpu/os/posix/kmem.c
index 5fe0aeb2..5fe0aeb2 100644
--- a/drivers/gpu/nvgpu/common/posix/kmem.c
+++ b/drivers/gpu/nvgpu/os/posix/kmem.c
diff --git a/drivers/gpu/nvgpu/common/posix/lock.c b/drivers/gpu/nvgpu/os/posix/lock.c
index bca0f04c..bca0f04c 100644
--- a/drivers/gpu/nvgpu/common/posix/lock.c
+++ b/drivers/gpu/nvgpu/os/posix/lock.c
diff --git a/drivers/gpu/nvgpu/common/posix/log.c b/drivers/gpu/nvgpu/os/posix/log.c
index 6bfb673c..6bfb673c 100644
--- a/drivers/gpu/nvgpu/common/posix/log.c
+++ b/drivers/gpu/nvgpu/os/posix/log.c
diff --git a/drivers/gpu/nvgpu/common/posix/nvgpu.c b/drivers/gpu/nvgpu/os/posix/nvgpu.c
index a275f2de..a275f2de 100644
--- a/drivers/gpu/nvgpu/common/posix/nvgpu.c
+++ b/drivers/gpu/nvgpu/os/posix/nvgpu.c
diff --git a/drivers/gpu/nvgpu/common/posix/nvlink.c b/drivers/gpu/nvgpu/os/posix/nvlink.c
index c830d6ed..c830d6ed 100644
--- a/drivers/gpu/nvgpu/common/posix/nvlink.c
+++ b/drivers/gpu/nvgpu/os/posix/nvlink.c
diff --git a/drivers/gpu/nvgpu/common/posix/os_posix.h b/drivers/gpu/nvgpu/os/posix/os_posix.h
index 955186ef..955186ef 100644
--- a/drivers/gpu/nvgpu/common/posix/os_posix.h
+++ b/drivers/gpu/nvgpu/os/posix/os_posix.h
diff --git a/drivers/gpu/nvgpu/common/posix/posix-comptags.c b/drivers/gpu/nvgpu/os/posix/posix-comptags.c
index a00246dd..a00246dd 100644
--- a/drivers/gpu/nvgpu/common/posix/posix-comptags.c
+++ b/drivers/gpu/nvgpu/os/posix/posix-comptags.c
diff --git a/drivers/gpu/nvgpu/common/posix/posix-nvgpu_mem.c b/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c
index fa92a7c6..fa92a7c6 100644
--- a/drivers/gpu/nvgpu/common/posix/posix-nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c
diff --git a/drivers/gpu/nvgpu/common/posix/posix-vm.c b/drivers/gpu/nvgpu/os/posix/posix-vm.c
index 588b956d..588b956d 100644
--- a/drivers/gpu/nvgpu/common/posix/posix-vm.c
+++ b/drivers/gpu/nvgpu/os/posix/posix-vm.c
diff --git a/drivers/gpu/nvgpu/common/posix/rwsem.c b/drivers/gpu/nvgpu/os/posix/rwsem.c
index 7a696b75..7a696b75 100644
--- a/drivers/gpu/nvgpu/common/posix/rwsem.c
+++ b/drivers/gpu/nvgpu/os/posix/rwsem.c
diff --git a/drivers/gpu/nvgpu/common/posix/soc.c b/drivers/gpu/nvgpu/os/posix/soc.c
index 2346d61e..2346d61e 100644
--- a/drivers/gpu/nvgpu/common/posix/soc.c
+++ b/drivers/gpu/nvgpu/os/posix/soc.c
diff --git a/drivers/gpu/nvgpu/common/posix/stubs.c b/drivers/gpu/nvgpu/os/posix/stubs.c
index 1e50930a..1e50930a 100644
--- a/drivers/gpu/nvgpu/common/posix/stubs.c
+++ b/drivers/gpu/nvgpu/os/posix/stubs.c
diff --git a/drivers/gpu/nvgpu/common/posix/thread.c b/drivers/gpu/nvgpu/os/posix/thread.c
index d9476523..d9476523 100644
--- a/drivers/gpu/nvgpu/common/posix/thread.c
+++ b/drivers/gpu/nvgpu/os/posix/thread.c
diff --git a/drivers/gpu/nvgpu/common/posix/timers.c b/drivers/gpu/nvgpu/os/posix/timers.c
index c84b0de5..c84b0de5 100644
--- a/drivers/gpu/nvgpu/common/posix/timers.c
+++ b/drivers/gpu/nvgpu/os/posix/timers.c
diff --git a/drivers/gpu/nvgpu/common/posix/tsg.c b/drivers/gpu/nvgpu/os/posix/tsg.c
index 8736123d..8736123d 100644
--- a/drivers/gpu/nvgpu/common/posix/tsg.c
+++ b/drivers/gpu/nvgpu/os/posix/tsg.c