diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /include/uapi/misc/cxl.h | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'include/uapi/misc/cxl.h')
| -rw-r--r-- | include/uapi/misc/cxl.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 { | |||
| 136 | * | 136 | * |
| 137 | * Of course the contents will be ABI, but that's up the AFU driver. | 137 | * Of course the contents will be ABI, but that's up the AFU driver. |
| 138 | */ | 138 | */ |
| 139 | size_t data_size; | 139 | __u32 data_size; |
| 140 | u8 data[]; | 140 | __u8 data[]; |
| 141 | }; | 141 | }; |
| 142 | 142 | ||
| 143 | struct cxl_event { | 143 | struct cxl_event { |