diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-04-23 17:43:50 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-11-15 14:38:27 +0100 |
commit | 3ca47e958a64b1116a2c35e65dcf467fc53d52de (patch) | |
tree | 9900980bcfdd65e8a8b7518d450b04908b325df4 /net/socket.c | |
parent | Linux 5.4-rc6 (diff) | |
download | linux-3ca47e958a64b1116a2c35e65dcf467fc53d52de.tar.xz linux-3ca47e958a64b1116a2c35e65dcf467fc53d52de.zip |
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 'net/socket.c')
-rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 6a9ab7a8b1d2..98f6544b0096 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2833,7 +2833,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args) a[2], true); break; case SYS_RECVMMSG: - if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME)) + if (IS_ENABLED(CONFIG_64BIT)) err = __sys_recvmmsg(a0, (struct mmsghdr __user *)a1, a[2], a[3], (struct __kernel_timespec __user *)a[4], |