6 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index c8a8ce49..d077f329 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -89,7 +89,7 @@ int vgpu_channel_alloc_inst(struct gk20a *g, struct channel_gk20a *ch)
         msg.cmd = TEGRA_VGPU_CMD_CHANNEL_ALLOC_HWCTX;
         msg.handle = vgpu_get_handle(g);
         p->id = ch->chid;
-        p->pid = (u64)current->tgid;
+        p->pid = (u64)ch->pid;
         err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
         if (err || msg.ret) {
                 nvgpu_err(g, "fail");
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.c
index 52b2aee5..0d3c6bc1 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.c
@@ -23,6 +23,7 @@
 #include <nvgpu/enabled.h>
 
 #include "gk20a/gk20a.h"
+#include "vgpu_fuse_gp10b.h"
 
 int vgpu_gp10b_fuse_check_priv_security(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c
index 18d2de70..9b689699 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c
@@ -26,6 +26,7 @@
 #include <nvgpu/vgpu/tegra_vgpu.h>
 
 #include "gv11b/fifo_gv11b.h"
+#include "vgpu_fifo_gv11b.h"
 
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
 
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c
index 3c93c581..df4d87da 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c
@@ -23,6 +23,7 @@
 #include "gk20a/gk20a.h"
 #include "vgpu/gr_vgpu.h"
 #include "vgpu_subctx_gv11b.h"
+#include "vgpu_gr_gv11b.h"
 
 int vgpu_gr_gv11b_commit_inst(struct channel_gk20a *c, u64 gpu_va)
 {
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c
index ba92c8d5..2372b9c4 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c
@@ -21,6 +21,7 @@
  */
 
 #include "gk20a/gk20a.h"
+#include "vgpu_subctx_gv11b.h"
 
 #include <nvgpu/vgpu/vgpu.h>
 #include <nvgpu/vgpu/tegra_vgpu.h>
diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
index 21496906..c10a1982 100644
--- a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
@@ -31,9 +31,6 @@
 #include <nvgpu/vgpu/vm.h>
 #include <nvgpu/vgpu/vgpu.h>
 
-#include <nvgpu/linux/vm.h>
-#include <nvgpu/linux/nvgpu_mem.h>
-
 #include "mm_vgpu.h"
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"