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

From: Gustavo Padovan
Date: Wed Mar 02 2016 - 14:52:35 EST


From: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx>

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

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

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;
};

--
2.5.0