aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@mellanox.com>2018-02-13 12:18:33 +0200
committerJason Gunthorpe <jgg@mellanox.com>2018-02-15 14:59:45 -0700
commit5d2beb576d32ef2cd047db8914e3602e99a12763 (patch)
tree572a718d870394e0a62fbf7c2a85e13ed8b66c9f
parentIB/uverbs: Fix method merging in uverbs_ioctl_merge (diff)
downloadlinux-dev-5d2beb576d32ef2cd047db8914e3602e99a12763.tar.xz
linux-dev-5d2beb576d32ef2cd047db8914e3602e99a12763.zip
IB/uverbs: Use __aligned_u64 for uapi headers
This has no impact on the structure layout since these structs already have their u64s already properly aligned, but it does document that we have this requirement for 32 bit compatibility. Signed-off-by: Leon Romanovsky <leon@kernel.org> Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-rw-r--r--include/uapi/rdma/rdma_user_ioctl.h4
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];
};