diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index a5d802de6..49c2f64bd 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -1252,7 +1252,7 @@ int nvgpu_vm_map(struct vm_gk20a *vm,
 	mapped_buffer->vm           = vm;
 	mapped_buffer->flags        = binfo.flags;
 	nvgpu_assert(map_key_kind >= 0);
-	mapped_buffer->kind         = (u32)map_key_kind;
+	mapped_buffer->kind         = map_key_kind;
 	mapped_buffer->va_allocated = va_allocated;
 	mapped_buffer->vm_area      = vm_area;
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h
index 18d14023a..44e589048 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h
@@ -117,7 +117,7 @@ struct nvgpu_mapped_buf {
 	u32 pgsz_idx;
 
 	u32 flags;
-	u32 kind;
+	s16 kind;
 	bool va_allocated;
 
 	/*
@@ -260,7 +260,7 @@ struct nvgpu_mapped_buf *nvgpu_vm_find_mapping(struct vm_gk20a *vm,
 					       struct nvgpu_os_buffer *os_buf,
 					       u64 map_addr,
 					       u32 flags,
-					       int kind);
+					       s16 kind);
 
 /**
  * Map a DMA buffer into the passed VM context.
diff --git a/drivers/gpu/nvgpu/os/linux/vm.c b/drivers/gpu/nvgpu/os/linux/vm.c
index 0cf978a5a..cbc11ba26 100644
--- a/drivers/gpu/nvgpu/os/linux/vm.c
+++ b/drivers/gpu/nvgpu/os/linux/vm.c
@@ -66,7 +66,7 @@ static u32 nvgpu_vm_translate_linux_flags(struct gk20a *g, u32 flags)
 }
 
 static struct nvgpu_mapped_buf *nvgpu_vm_find_mapped_buf_reverse(
-	struct vm_gk20a *vm, struct dma_buf *dmabuf, u32 kind)
+	struct vm_gk20a *vm, struct dma_buf *dmabuf, s16 kind)
 {
 	struct nvgpu_rbtree_node *node = NULL;
 	struct nvgpu_rbtree_node *root = vm->mapped_buffers;
@@ -126,7 +126,7 @@ struct nvgpu_mapped_buf *nvgpu_vm_find_mapping(struct vm_gk20a *vm,
 					       struct nvgpu_os_buffer *os_buf,
 					       u64 map_addr,
 					       u32 flags,
-					       int kind)
+					       s16 kind)
 {
 	struct gk20a *g = gk20a_from_vm(vm);
 	struct nvgpu_mapped_buf *mapped_buffer = NULL;
@@ -137,7 +137,7 @@ struct nvgpu_mapped_buf *nvgpu_vm_find_mapping(struct vm_gk20a *vm,
 			return NULL;
 
 		if (mapped_buffer->os_priv.dmabuf != os_buf->dmabuf ||
-		    mapped_buffer->kind != (u32)kind)
+		    mapped_buffer->kind != kind)
 			return NULL;
 	} else {
 		mapped_buffer =
diff --git a/drivers/gpu/nvgpu/os/posix/posix-vm.c b/drivers/gpu/nvgpu/os/posix/posix-vm.c
index 19da86d9f..d2e0b8b2b 100644
--- a/drivers/gpu/nvgpu/os/posix/posix-vm.c
+++ b/drivers/gpu/nvgpu/os/posix/posix-vm.c
@@ -36,7 +36,7 @@ struct nvgpu_mapped_buf *nvgpu_vm_find_mapping(struct vm_gk20a *vm,
 					       struct nvgpu_os_buffer *os_buf,
 					       u64 map_addr,
 					       u32 flags,
-					       int kind)
+					       s16 kind)
 {
 	/*
 	 * No map caching for now.