[v6,4/6] staging/android: align struct sync_merge_data to a multiple of 64-bits

Submitted by Gustavo Padovan on March 2, 2016, 7:52 p.m.

Details

Message ID 1456948331-7300-4-git-send-email-gustavo@padovan.org
State New
Headers show
Series "Series without cover letter" ( rev: 4 3 2 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Gustavo Padovan March 2, 2016, 7:52 p.m.
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Change order of the field to avoid alignment issues with 64 bits
platforms.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 drivers/staging/android/uapi/sync.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
index f0b41ce..a6c648c 100644
--- a/drivers/staging/android/uapi/sync.h
+++ b/drivers/staging/android/uapi/sync.h
@@ -16,13 +16,13 @@ 
 
 /**
  * struct sync_merge_data - data passed to merge ioctl
- * @fd2:	file descriptor of second fence
  * @name:	name of new fence
+ * @fd2:	file descriptor of second fence
  * @fence:	returns the fd of the new fence to userspace
  */
 struct sync_merge_data {
-	__s32	fd2;
 	char	name[32];
+	__s32	fd2;
 	__s32	fence;
 };
 

Comments

2016-03-02 Gustavo Padovan <gustavo@padovan.org>:

> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> Change order of the field to avoid alignment issues with 64 bits
> platforms.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
>  drivers/staging/android/uapi/sync.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Please ignore this patch, it is not really needed.

	Gustavo