diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-18 12:20:19 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-18 12:20:19 +0300 |
| commit | 5a96215739fbda2ccc0f2371295e93e4cb6a088a (patch) | |
| tree | 65459d484c23c0574984a1ac237254ce69c1f623 /include/uapi | |
| parent | 1fc770d5899c995db8e22d35eb918a2cb79559d9 (diff) | |
| parent | 03cbc732639ddcad15218c4b2046d255851ff1e3 (diff) | |
| download | linux-5a96215739fbda2ccc0f2371295e93e4cb6a088a.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/virtio_vsock.h | 2 | ||||
| -rw-r--r-- | include/uapi/misc/cxl.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h index 6b011c19b50f..1d57ed3d84d2 100644 --- a/include/uapi/linux/virtio_vsock.h +++ b/include/uapi/linux/virtio_vsock.h @@ -32,7 +32,7 @@ */ #ifndef _UAPI_LINUX_VIRTIO_VSOCK_H -#define _UAPI_LINUX_VIRTIO_VOSCK_H +#define _UAPI_LINUX_VIRTIO_VSOCK_H #include <linux/types.h> #include <linux/virtio_ids.h> diff --git a/include/uapi/misc/cxl.h b/include/uapi/misc/cxl.h index cbae529b7ce0..180d526a55c3 100644 --- a/include/uapi/misc/cxl.h +++ b/include/uapi/misc/cxl.h @@ -136,8 +136,8 @@ struct cxl_event_afu_driver_reserved { * * Of course the contents will be ABI, but that's up the AFU driver. */ - size_t data_size; - u8 data[]; + __u32 data_size; + __u8 data[]; }; struct cxl_event { |