summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/uapi/asm/shmbuf.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-11-04 21:17:26 +0100
committerArnd Bergmann <arnd@arndb.de>2019-11-15 14:38:28 +0100
commitcaf5e32d4ea7253820f38dd7c429f8d4a8019c5f (patch)
tree1a428ad98618a0a9e5585feddf8d628887cc9522 /arch/powerpc/include/uapi/asm/shmbuf.h
parent176ed98c8a76ee08babf99b25b00992c2a5e7bbc (diff)
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/powerpc/include/uapi/asm/shmbuf.h')
-rw-r--r--arch/powerpc/include/uapi/asm/shmbuf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/uapi/asm/shmbuf.h b/arch/powerpc/include/uapi/asm/shmbuf.h
index b591c4d7e4c5..00422b2f3c63 100644
--- a/arch/powerpc/include/uapi/asm/shmbuf.h
+++ b/arch/powerpc/include/uapi/asm/shmbuf.h
@@ -22,9 +22,9 @@
struct shmid64_ds {
struct ipc64_perm shm_perm; /* operation perms */
#ifdef __powerpc64__
- __kernel_time_t shm_atime; /* last attach time */
- __kernel_time_t shm_dtime; /* last detach time */
- __kernel_time_t shm_ctime; /* last change time */
+ long shm_atime; /* last attach time */
+ long shm_dtime; /* last detach time */
+ long shm_ctime; /* last change time */
#else
unsigned long shm_atime_high;
unsigned long shm_atime; /* last attach time */