summary refs log tree commit diff
path: root/ipc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-04-23 17:43:50 +0200
committerArnd Bergmann <arnd@arndb.de>2019-11-15 14:38:27 +0100
commit3ca47e958a64b1116a2c35e65dcf467fc53d52de (patch)
tree9900980bcfdd65e8a8b7518d450b04908b325df4 /ipc
parenta99d8080aaf358d5d23581244e5da23b35e340b9 (diff)
downloadlinux-3ca47e958a64b1116a2c35e65dcf467fc53d52de.tar.gz
y2038: remove CONFIG_64BIT_TIME
The CONFIG_64BIT_TIME option is defined on all architectures, and can
be removed for simplicity now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/syscall.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/syscall.c b/ipc/syscall.c
index 581bdff4e7c5..dfb0e988d542 100644
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
@@ -30,7 +30,7 @@ int ksys_ipc(unsigned int call, int first, unsigned long second,
 		return ksys_semtimedop(first, (struct sembuf __user *)ptr,
 				       second, NULL);
 	case SEMTIMEDOP:
-		if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME))
+		if (IS_ENABLED(CONFIG_64BIT))
 			return ksys_semtimedop(first, ptr, second,
 			        (const struct __kernel_timespec __user *)fifth);
 		else if (IS_ENABLED(CONFIG_COMPAT_32BIT_TIME))