Messages in this thread Patch in this message | | | Date | Mon, 20 Jan 2014 21:16:22 -0800 | From | "tip-bot for H.J. Lu" <> | Subject | [tip:x86/x32] x86, uapi, x32: Use __kernel_ulong_t in x86 struct semid64_ds |
| |
Commit-ID: 386916598e901e406c1f1fc801ade2646a1e8137 Gitweb: http://git.kernel.org/tip/386916598e901e406c1f1fc801ade2646a1e8137 Author: H.J. Lu <hjl.tools@gmail.com> AuthorDate: Fri, 27 Dec 2013 14:14:22 -0800 Committer: H. Peter Anvin <hpa@zytor.com> CommitDate: Mon, 20 Jan 2014 14:45:13 -0800
x86, uapi, x32: Use __kernel_ulong_t in x86 struct semid64_ds
Both x32 and x86-64 use the same struct semid64_ds for system calls. But x32 long is 32-bit. This patch replaces unsigned long with __kernel_ulong_t in x86 struct semid64_ds.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Link: http://lkml.kernel.org/r/1388182464-28428-7-git-send-email-hjl.tools@gmail.com Signed-off-by: H. Peter Anvin <hpa@zytor.com> --- arch/x86/include/uapi/asm/sembuf.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index ee50c80..cc2d6a3 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -13,12 +13,12 @@ struct semid64_ds { struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ __kernel_time_t sem_otime; /* last semop time */ - unsigned long __unused1; + __kernel_ulong_t __unused1; __kernel_time_t sem_ctime; /* last change time */ - unsigned long __unused2; - unsigned long sem_nsems; /* no. of semaphores in array */ - unsigned long __unused3; - unsigned long __unused4; + __kernel_ulong_t __unused2; + __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ + __kernel_ulong_t __unused3; + __kernel_ulong_t __unused4; }; #endif /* _ASM_X86_SEMBUF_H */
| |