diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
index dc2daafe1..5e25fac65 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
@@ -331,6 +331,7 @@ gk20a_ctrl_ioctl_gpu_characteristics(
 	gpu.ioctl_channel_nr_last = NVGPU_IOCTL_CHANNEL_LAST;
 	gpu.as_ioctl_nr_last = NVGPU_AS_IOCTL_LAST;
 	gpu.event_ioctl_nr_last = NVGPU_EVENT_IOCTL_LAST;
+	gpu.ctxsw_ioctl_nr_last = NVGPU_CTXSW_IOCTL_LAST;
 	gpu.gpu_va_bit_count = 40;
 
 	strlcpy(gpu.chipname, g->name, sizeof(gpu.chipname));
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 3ec4d66e0..93afdde43 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -280,6 +280,9 @@ struct nvgpu_gpu_characteristics {
 
 	__u32 max_css_buffer_size;
 
+	__s16 ctxsw_ioctl_nr_last;
+	__u8 reserved2[6];
+
 	/* Notes:
 	   - This struct can be safely appended with new fields. However, always
 	     keep the structure size multiple of 8 and make sure that the binary