mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
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>
59 lines
1.8 KiB
C
59 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef __ASM_GENERIC_SHMBUF_H
|
|
#define __ASM_GENERIC_SHMBUF_H
|
|
|
|
#include <asm/bitsperlong.h>
|
|
|
|
/*
|
|
* The shmid64_ds structure for x86 architecture.
|
|
* Note extra padding because this structure is passed back and forth
|
|
* between kernel and user space.
|
|
*
|
|
* shmid64_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 shmid64_ds {
|
|
struct ipc64_perm shm_perm; /* operation perms */
|
|
size_t shm_segsz; /* size of segment (bytes) */
|
|
#if __BITS_PER_LONG == 64
|
|
long shm_atime; /* last attach time */
|
|
long shm_dtime; /* last detach time */
|
|
long shm_ctime; /* last change time */
|
|
#else
|
|
unsigned long shm_atime; /* last attach time */
|
|
unsigned long shm_atime_high;
|
|
unsigned long shm_dtime; /* last detach time */
|
|
unsigned long shm_dtime_high;
|
|
unsigned long shm_ctime; /* last change time */
|
|
unsigned long shm_ctime_high;
|
|
#endif
|
|
__kernel_pid_t shm_cpid; /* pid of creator */
|
|
__kernel_pid_t shm_lpid; /* pid of last operator */
|
|
unsigned long shm_nattch; /* no. of current attaches */
|
|
unsigned long __unused4;
|
|
unsigned long __unused5;
|
|
};
|
|
|
|
struct shminfo64 {
|
|
unsigned long shmmax;
|
|
unsigned long shmmin;
|
|
unsigned long shmmni;
|
|
unsigned long shmseg;
|
|
unsigned long shmall;
|
|
unsigned long __unused1;
|
|
unsigned long __unused2;
|
|
unsigned long __unused3;
|
|
unsigned long __unused4;
|
|
};
|
|
|
|
#endif /* __ASM_GENERIC_SHMBUF_H */
|