diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 08:42:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 08:42:02 -0500 |
| commit | a02001086bbfb4da35d1228bebc2f1b442db455f (patch) | |
| tree | 62ab47936cef06fd08657ca5b6cd1df98c19be57 /include/uapi/linux/hyperv.h | |
| parent | eff264efeeb0898408e8c9df72d8a32621035bed (diff) | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
Merge Linus' tree to be be to apply submitted patches to newer code than
current trivial.git base
Diffstat (limited to 'include/uapi/linux/hyperv.h')
| -rw-r--r-- | include/uapi/linux/hyperv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h index 78e4a86030dd..0a8e6badb29b 100644 --- a/include/uapi/linux/hyperv.h +++ b/include/uapi/linux/hyperv.h | |||
| @@ -137,7 +137,7 @@ struct hv_do_fcopy { | |||
| 137 | __u64 offset; | 137 | __u64 offset; |
| 138 | __u32 size; | 138 | __u32 size; |
| 139 | __u8 data[DATA_FRAGMENT]; | 139 | __u8 data[DATA_FRAGMENT]; |
| 140 | }; | 140 | } __attribute__((packed)); |
| 141 | 141 | ||
| 142 | /* | 142 | /* |
| 143 | * An implementation of HyperV key value pair (KVP) functionality for Linux. | 143 | * An implementation of HyperV key value pair (KVP) functionality for Linux. |