diff options
| author | Doug Ledford <dledford@redhat.com> | 2018-02-22 22:27:20 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2018-02-22 22:27:20 -0500 |
| commit | 4bb46608ed78758c89c77ae5d1163dce3df95950 (patch) | |
| tree | fe1691e368ea0633ece93d790cd7f90f6afb91f2 /include/uapi/rdma | |
| parent | f76a5c75d93b0e9c14aa4d4422e7e7f8382a7ecb (diff) | |
| parent | f45765872e7aae7b81feb3044aaf9886b21885ef (diff) | |
Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next
There is a 14 patch series waiting to come into for-next that has a
dependecy on code submitted into this kernel's for-rc series. So, merge
the for-rc branch into the current for-next in order to make the patch
series apply cleanly.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/uapi/rdma')
| -rw-r--r-- | include/uapi/rdma/rdma_user_ioctl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/rdma/rdma_user_ioctl.h b/include/uapi/rdma/rdma_user_ioctl.h index 03557b5f9aa6..46de0885e800 100644 --- a/include/uapi/rdma/rdma_user_ioctl.h +++ b/include/uapi/rdma/rdma_user_ioctl.h @@ -65,7 +65,7 @@ struct ib_uverbs_attr { __u16 len; /* only for pointers */ __u16 flags; /* combination of UVERBS_ATTR_F_XXXX */ __u16 reserved; - __u64 data; /* ptr to command, inline data or idr/fd */ + __aligned_u64 data; /* ptr to command, inline data or idr/fd */ }; struct ib_uverbs_ioctl_hdr { @@ -73,7 +73,7 @@ struct ib_uverbs_ioctl_hdr { __u16 object_id; __u16 method_id; __u16 num_attrs; - __u64 reserved; + __aligned_u64 reserved; struct ib_uverbs_attr attrs[0]; }; |