Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

H.J. Lu and committed by
H. Peter Anvin
b9cd5ca2 443d5670

+5 -5
+5 -5
include/uapi/asm-generic/msgbuf.h
··· 35 35 #if __BITS_PER_LONG != 64 36 36 unsigned long __unused3; 37 37 #endif 38 - unsigned long msg_cbytes; /* current number of bytes on queue */ 39 - unsigned long msg_qnum; /* number of messages in queue */ 40 - unsigned long msg_qbytes; /* max number of bytes on queue */ 38 + __kernel_ulong_t msg_cbytes; /* current number of bytes on queue */ 39 + __kernel_ulong_t msg_qnum; /* number of messages in queue */ 40 + __kernel_ulong_t msg_qbytes; /* max number of bytes on queue */ 41 41 __kernel_pid_t msg_lspid; /* pid of last msgsnd */ 42 42 __kernel_pid_t msg_lrpid; /* last receive pid */ 43 - unsigned long __unused4; 44 - unsigned long __unused5; 43 + __kernel_ulong_t __unused4; 44 + __kernel_ulong_t __unused5; 45 45 }; 46 46 47 47 #endif /* __ASM_GENERIC_MSGBUF_H */