All of lore.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot for H.J. Lu" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	tglx@linutronix.de, hjl.tools@gmail.com
Subject: [tip:x86/x32] uapi: Use __kernel_ulong_t in struct msqid64_ds
Date: Mon, 20 Jan 2014 21:16:13 -0800	[thread overview]
Message-ID: <tip-b9cd5ca22d6739c61655d4fcf8b29669d5d177a3@git.kernel.org> (raw)
In-Reply-To: <1388182464-28428-6-git-send-email-hjl.tools@gmail.com>

Commit-ID:  b9cd5ca22d6739c61655d4fcf8b29669d5d177a3
Gitweb:     http://git.kernel.org/tip/b9cd5ca22d6739c61655d4fcf8b29669d5d177a3
Author:     H.J. Lu <hjl.tools@gmail.com>
AuthorDate: Fri, 27 Dec 2013 14:14:21 -0800
Committer:  H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 20 Jan 2014 14:45:01 -0800

uapi: Use __kernel_ulong_t in struct msqid64_ds

Both x32 and x86-64 use the same struct msqid64_ds for system calls.
But x32 long is 32-bit. This patch replaces unsigned long with
__kernel_ulong_t in struct msqid64_ds.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Link: http://lkml.kernel.org/r/1388182464-28428-6-git-send-email-hjl.tools@gmail.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 include/uapi/asm-generic/msgbuf.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/uapi/asm-generic/msgbuf.h b/include/uapi/asm-generic/msgbuf.h
index aec850d..f55ecc4 100644
--- a/include/uapi/asm-generic/msgbuf.h
+++ b/include/uapi/asm-generic/msgbuf.h
@@ -35,13 +35,13 @@ struct msqid64_ds {
 #if __BITS_PER_LONG != 64
 	unsigned long	__unused3;
 #endif
-	unsigned long  msg_cbytes;	/* current number of bytes on queue */
-	unsigned long  msg_qnum;	/* number of messages in queue */
-	unsigned long  msg_qbytes;	/* max number of bytes on queue */
+	__kernel_ulong_t msg_cbytes;	/* current number of bytes on queue */
+	__kernel_ulong_t msg_qnum;	/* number of messages in queue */
+	__kernel_ulong_t msg_qbytes;	/* max number of bytes on queue */
 	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */
 	__kernel_pid_t msg_lrpid;	/* last receive pid */
-	unsigned long  __unused4;
-	unsigned long  __unused5;
+	__kernel_ulong_t __unused4;
+	__kernel_ulong_t __unused5;
 };
 
 #endif /* __ASM_GENERIC_MSGBUF_H */

  reply	other threads:[~2014-01-21  5:17 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-27 22:14 [PATCH 0/8] Update kernel uabi header files for x32 H.J. Lu
2013-12-27 22:14 ` [PATCH 1/8] Use __kernel_long_t in struct timex H.J. Lu
2014-01-21  5:15   ` [tip:x86/x32] uapi: " tip-bot for H.J. Lu
2013-12-27 22:14 ` [PATCH 2/8] Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h> H.J. Lu
2014-01-21  5:15   ` [tip:x86/x32] uapi: Use __kernel_long_t/__kernel_ulong_t in < linux/resource.h> tip-bot for H.J. Lu
2013-12-27 22:14 ` [PATCH 3/8] Use __kernel_ulong_t in uapi struct ipc64_perm H.J. Lu
2014-01-21  5:15   ` [tip:x86/x32] uapi, asm-generic: " tip-bot for H.J. Lu
2013-12-27 22:14 ` [PATCH 4/8] Use __kernel_long_t in struct msgbuf H.J. Lu
2014-01-21  5:16   ` [tip:x86/x32] uapi: " tip-bot for H.J. Lu
2013-12-27 22:14 ` [PATCH 5/8] Use __kernel_ulong_t in struct msqid64_ds H.J. Lu
2014-01-21  5:16   ` tip-bot for H.J. Lu [this message]
2013-12-27 22:14 ` [PATCH 6/8] Use __kernel_ulong_t in x86 struct semid64_ds H.J. Lu
2014-01-21  5:16   ` [tip:x86/x32] x86, uapi, x32: " tip-bot for H.J. Lu
2013-12-27 22:14 ` [PATCH 7/8] Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info H.J. Lu
2014-01-21  5:16   ` [tip:x86/x32] uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/ shm_info tip-bot for H.J. Lu
2013-12-27 22:14 ` [PATCH 8/8] Use __kernel_long_t in struct mq_attr H.J. Lu
2014-01-21  5:16   ` [tip:x86/x32] uapi: " tip-bot for H.J. Lu
2015-11-24  4:39   ` [PATCH 8/8] " Dmitry V. Levin
2013-12-28 16:33 ` [PATCH 0/8] Update kernel uabi header files for x32 Christoph Hellwig
2013-12-28 17:01   ` H. Peter Anvin
2014-01-20 17:46   ` H. Peter Anvin
2014-01-20 17:50     ` Christoph Hellwig
2014-01-20 17:51       ` H.J. Lu
2014-01-20 17:52         ` H.J. Lu
2014-01-20 17:52         ` H. Peter Anvin
2014-01-20 17:52       ` H. Peter Anvin
2014-01-21 12:04     ` Catalin Marinas
2014-01-21 12:22       ` H.J. Lu
2014-01-21 15:43       ` H. Peter Anvin
2014-01-21 17:06 ` H. Peter Anvin
2014-01-22 15:10   ` Catalin Marinas
2014-01-22 15:10     ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-b9cd5ca22d6739c61655d4fcf8b29669d5d177a3@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hjl.tools@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.