commit 3ca47e958a64b1116a2c35e65dcf467fc53d52de
author Arnd Bergmann <arnd@arndb.de> Tue Apr 23 17:43:50 2019 +0200
committer Arnd Bergmann <arnd@arndb.de> Fri Nov 15 14:38:27 2019 +0100
tree 9900980bcfdd65e8a8b7518d450b04908b325df4
parent a99d8080aaf358d5d23581244e5da23b35e340b9

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>

net/socket.c

diff --git a/net/socket.c b/net/socket.c
index 6a9ab7a..98f6544 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],