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>
48 lines
1.6 KiB
C
48 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef __ASM_GENERIC_MSGBUF_H
|
|
#define __ASM_GENERIC_MSGBUF_H
|
|
|
|
#include <asm/bitsperlong.h>
|
|
/*
|
|
* generic msqid64_ds structure.
|
|
*
|
|
* Note extra padding because this structure is passed back and forth
|
|
* between kernel and user space.
|
|
*
|
|
* msqid64_ds was originally meant to be architecture specific, but
|
|
* everyone just ended up making identical copies without specific
|
|
* optimizations, so we may just as well all use the same one.
|
|
*
|
|
* 64 bit architectures use a 64-bit long time field here, while
|
|
* 32 bit architectures have a pair of unsigned long values.
|
|
* On big-endian systems, the lower half is in the wrong place.
|
|
*
|
|
* Pad space is left for:
|
|
* - 2 miscellaneous 32-bit values
|
|
*/
|
|
|
|
struct msqid64_ds {
|
|
struct ipc64_perm msg_perm;
|
|
#if __BITS_PER_LONG == 64
|
|
long msg_stime; /* last msgsnd time */
|
|
long msg_rtime; /* last msgrcv time */
|
|
long msg_ctime; /* last change time */
|
|
#else
|
|
unsigned long msg_stime; /* last msgsnd time */
|
|
unsigned long msg_stime_high;
|
|
unsigned long msg_rtime; /* last msgrcv time */
|
|
unsigned long msg_rtime_high;
|
|
unsigned long msg_ctime; /* last change time */
|
|
unsigned long msg_ctime_high;
|
|
#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_pid_t msg_lspid; /* pid of last msgsnd */
|
|
__kernel_pid_t msg_lrpid; /* last receive pid */
|
|
unsigned long __unused4;
|
|
unsigned long __unused5;
|
|
};
|
|
|
|
#endif /* __ASM_GENERIC_MSGBUF_H */
|