mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +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>
43 lines
1.2 KiB
C
43 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef __ASM_X86_SHMBUF_H
|
|
#define __ASM_X86_SHMBUF_H
|
|
|
|
#if !defined(__x86_64__) || !defined(__ILP32__)
|
|
#include <asm-generic/shmbuf.h>
|
|
#else
|
|
/*
|
|
* The shmid64_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 shmid64_ds {
|
|
struct ipc64_perm shm_perm; /* operation perms */
|
|
size_t shm_segsz; /* size of segment (bytes) */
|
|
__kernel_long_t shm_atime; /* last attach time */
|
|
__kernel_long_t shm_dtime; /* last detach time */
|
|
__kernel_long_t shm_ctime; /* last change time */
|
|
__kernel_pid_t shm_cpid; /* pid of creator */
|
|
__kernel_pid_t shm_lpid; /* pid of last operator */
|
|
__kernel_ulong_t shm_nattch; /* no. of current attaches */
|
|
__kernel_ulong_t __unused4;
|
|
__kernel_ulong_t __unused5;
|
|
};
|
|
|
|
struct shminfo64 {
|
|
__kernel_ulong_t shmmax;
|
|
__kernel_ulong_t shmmin;
|
|
__kernel_ulong_t shmmni;
|
|
__kernel_ulong_t shmseg;
|
|
__kernel_ulong_t shmall;
|
|
__kernel_ulong_t __unused1;
|
|
__kernel_ulong_t __unused2;
|
|
__kernel_ulong_t __unused3;
|
|
__kernel_ulong_t __unused4;
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif /* __ASM_X86_SHMBUF_H */
|