From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754765Ab3L0RZk (ORCPT ); Fri, 27 Dec 2013 12:25:40 -0500 Received: from mail-yh0-f43.google.com ([209.85.213.43]:32909 "EHLO mail-yh0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754669Ab3L0RZd (ORCPT ); Fri, 27 Dec 2013 12:25:33 -0500 From: "H.J. Lu" To: "H. Peter Anvin" , LKML Cc: "H.J. Lu" Subject: [PATCH 4/8] Use __kernel_long_t in struct msgbuf Date: Fri, 27 Dec 2013 09:25:08 -0800 Message-Id: <1388165112-6545-5-git-send-email-hjl.tools@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1388165112-6545-1-git-send-email-hjl.tools@gmail.com> References: <1388165112-6545-1-git-send-email-hjl.tools@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X32 msgsnd/msgrcv system calls are the same as x86-64 msgsnd/msgrcv system calls, which use 64-bit integer for long in struct msgbuf . But x32 long is 32 bit. This patch replaces long in struct msgbuf with __kernel_long_t if __BITS_PER_LONG == 64. Signed-off-by: H.J. Lu --- include/uapi/linux/msg.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/msg.h b/include/uapi/linux/msg.h index 22d95c6..6b6ec96 100644 --- a/include/uapi/linux/msg.h +++ b/include/uapi/linux/msg.h @@ -34,8 +34,12 @@ struct msqid_ds { /* message buffer for msgsnd and msgrcv calls */ struct msgbuf { - long mtype; /* type of message */ - char mtext[1]; /* message text */ +#if __BITS_PER_LONG == 64 + __kernel_long_t mtype; /* type of message */ +#else + long mtype; /* type of message */ +#endif + char mtext[1]; /* message text */ }; /* buffer for msgctl calls IPC_INFO, MSG_INFO */ -- 1.8.4.2