diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-11-04 21:17:26 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-11-15 14:38:28 +0100 |
| commit | caf5e32d4ea7253820f38dd7c429f8d4a8019c5f (patch) | |
| tree | 1a428ad98618a0a9e5585feddf8d628887cc9522 /arch/x86/include/uapi/asm/msgbuf.h | |
| parent | 176ed98c8a76ee08babf99b25b00992c2a5e7bbc (diff) | |
| download | linux-caf5e32d4ea7253820f38dd7c429f8d4a8019c5f.tar.gz linux-caf5e32d4ea7253820f38dd7c429f8d4a8019c5f.tar.bz2 linux-caf5e32d4ea7253820f38dd7c429f8d4a8019c5f.zip | |
y2038: ipc: remove __kernel_time_t reference from headers
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>
Diffstat (limited to 'arch/x86/include/uapi/asm/msgbuf.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/msgbuf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/uapi/asm/msgbuf.h b/arch/x86/include/uapi/asm/msgbuf.h index 90ab9a795b49..7c5bb43ed8af 100644 --- a/arch/x86/include/uapi/asm/msgbuf.h +++ b/arch/x86/include/uapi/asm/msgbuf.h @@ -15,9 +15,9 @@ struct msqid64_ds { struct ipc64_perm msg_perm; - __kernel_time_t msg_stime; /* last msgsnd time */ - __kernel_time_t msg_rtime; /* last msgrcv time */ - __kernel_time_t msg_ctime; /* last change time */ + __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 */ |