diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2013-12-27 17:14:21 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-20 17:45:01 -0500 |
commit | b9cd5ca22d6739c61655d4fcf8b29669d5d177a3 (patch) | |
tree | 617988643a7a190c8960d489b2cabf2794585fb1 /include/uapi | |
parent | 443d5670f77aab121cb95f45da60f0aad390bcb5 (diff) |
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>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/asm-generic/msgbuf.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/uapi/asm-generic/msgbuf.h b/include/uapi/asm-generic/msgbuf.h index aec850d9159e..f55ecc43c60f 100644 --- a/include/uapi/asm-generic/msgbuf.h +++ b/include/uapi/asm-generic/msgbuf.h | |||
@@ -35,13 +35,13 @@ struct msqid64_ds { | |||
35 | #if __BITS_PER_LONG != 64 | 35 | #if __BITS_PER_LONG != 64 |
36 | unsigned long __unused3; | 36 | unsigned long __unused3; |
37 | #endif | 37 | #endif |
38 | unsigned long msg_cbytes; /* current number of bytes on queue */ | 38 | __kernel_ulong_t msg_cbytes; /* current number of bytes on queue */ |
39 | unsigned long msg_qnum; /* number of messages in queue */ | 39 | __kernel_ulong_t msg_qnum; /* number of messages in queue */ |
40 | unsigned long msg_qbytes; /* max number of bytes on queue */ | 40 | __kernel_ulong_t msg_qbytes; /* max number of bytes on queue */ |
41 | __kernel_pid_t msg_lspid; /* pid of last msgsnd */ | 41 | __kernel_pid_t msg_lspid; /* pid of last msgsnd */ |
42 | __kernel_pid_t msg_lrpid; /* last receive pid */ | 42 | __kernel_pid_t msg_lrpid; /* last receive pid */ |
43 | unsigned long __unused4; | 43 | __kernel_ulong_t __unused4; |
44 | unsigned long __unused5; | 44 | __kernel_ulong_t __unused5; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | #endif /* __ASM_GENERIC_MSGBUF_H */ | 47 | #endif /* __ASM_GENERIC_MSGBUF_H */ |