caf5e32d4e
There are two structures based on time_t that conflict between libc and kernel: timeval and timespec. Both are now renamed to __kernel_old_timeval and __kernel_old_timespec. For time_t, the old typedef is still __kernel_time_t. There is nothing wrong with that name, but it would be nice to not use that going forward as this type is used almost only in deprecated interfaces because of the y2038 overflow. In the IPC headers (msgbuf.h, sembuf.h, shmbuf.h), __kernel_time_t is only used for the 64-bit variants, which are not deprecated. Change these to a plain 'long', which is the same type as __kernel_time_t on all 64-bit architectures anyway, to reduce the number of users of the old type. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
33 lines
1.0 KiB
C
33 lines
1.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef __ASM_X64_MSGBUF_H
|
|
#define __ASM_X64_MSGBUF_H
|
|
|
|
#if !defined(__x86_64__) || !defined(__ILP32__)
|
|
#include <asm-generic/msgbuf.h>
|
|
#else
|
|
/*
|
|
* The msqid64_ds structure for x86 architecture with x32 ABI.
|
|
*
|
|
* On x86-32 and x86-64 we can just use the generic definition, but
|
|
* x32 uses the same binary layout as x86_64, which is differnet
|
|
* from other 32-bit architectures.
|
|
*/
|
|
|
|
struct msqid64_ds {
|
|
struct ipc64_perm msg_perm;
|
|
__kernel_long_t msg_stime; /* last msgsnd time */
|
|
__kernel_long_t msg_rtime; /* last msgrcv time */
|
|
__kernel_long_t msg_ctime; /* last change time */
|
|
__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 */
|
|
__kernel_ulong_t __unused4;
|
|
__kernel_ulong_t __unused5;
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif /* __ASM_GENERIC_MSGBUF_H */
|