Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755304AbcCBTwd (ORCPT ); Wed, 2 Mar 2016 14:52:33 -0500 Received: from mail-yw0-f193.google.com ([209.85.161.193]:36661 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755108AbcCBTwb (ORCPT ); Wed, 2 Mar 2016 14:52:31 -0500 From: Gustavo Padovan To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, Daniel Stone , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , Maarten Lankhorst , Gustavo Padovan Subject: [PATCH v6 4/6] staging/android: align struct sync_merge_data to a multiple of 64-bits Date: Wed, 2 Mar 2016 16:52:09 -0300 Message-Id: <1456948331-7300-4-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456948331-7300-1-git-send-email-gustavo@padovan.org> References: <1456948331-7300-1-git-send-email-gustavo@padovan.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 858 Lines: 32 From: Gustavo Padovan Change order of the field to avoid alignment issues with 64 bits platforms. Signed-off-by: Gustavo Padovan --- 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