diff --git a/drivers/gpu/nvgpu/common/mm/vm_remap.c b/drivers/gpu/nvgpu/common/mm/vm_remap.c
index 48d61dec2..ccd729ea8 100644
--- a/drivers/gpu/nvgpu/common/mm/vm_remap.c
+++ b/drivers/gpu/nvgpu/common/mm/vm_remap.c
@@ -544,7 +544,7 @@ static int nvgpu_vm_remap_get_mpool(struct vm_gk20a *vm,
 				struct nvgpu_vm_remap_mpool **curr_mpool,
 				u32 *curr_mem_handle)
 {
-	struct nvgpu_vm_remap_os_buffer remap_os_buf = { 0 };
+	struct nvgpu_vm_remap_os_buffer remap_os_buf;
 	int err = 0;
 
 	if (op->mem_handle == *curr_mem_handle) {
diff --git a/drivers/gpu/nvgpu/os/linux/vm_remap.c b/drivers/gpu/nvgpu/os/linux/vm_remap.c
index 7925841ef..dded7e673 100644
--- a/drivers/gpu/nvgpu/os/linux/vm_remap.c
+++ b/drivers/gpu/nvgpu/os/linux/vm_remap.c
@@ -100,6 +100,8 @@ int nvgpu_vm_remap_os_buf_get(struct vm_gk20a *vm,
 		goto clean_up;
 	}
 
+	memset(remap_os_buf, 0, sizeof(*remap_os_buf));
+
 	remap_os_buf->os_priv.dmabuf = dmabuf;
 	remap_os_buf->os_priv.attachment = attachment;
 	remap_os_buf->os_priv.sgt = sgt;