From patchwork Fri Apr 26 14:25:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10919235 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF83B1398 for ; Fri, 26 Apr 2019 14:27:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD995288DC for ; Fri, 26 Apr 2019 14:27:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1BE828BF0; Fri, 26 Apr 2019 14:27:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 336BD288DC for ; Fri, 26 Apr 2019 14:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726409AbfDZO0y (ORCPT ); Fri, 26 Apr 2019 10:26:54 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:47817 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726300AbfDZO0x (ORCPT ); Fri, 26 Apr 2019 10:26:53 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1N79Ey-1gjxWY3Vdc-017SDB; Fri, 26 Apr 2019 16:26:34 +0200 From: Arnd Bergmann To: Thomas Gleixner Cc: Joseph Myers , libc-alpha@sourceware.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, Deepa Dinamani , Arnd Bergmann , Benjamin LaHaise , Alexander Viro , John Stultz , Stephen Boyd , "David S. Miller" , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 2/2] y2038: remove CONFIG_64BIT_TIME Date: Fri, 26 Apr 2019 16:25:05 +0200 Message-Id: <20190426142531.1378357-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426142531.1378357-1-arnd@arndb.de> References: <20190426142531.1378357-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:pjXQoUiFLLd5AZcOYPHe+Yv87CKp/2bRQj9L5IdyHlllyX1swCL KEyyDzWxeJiMQRVJsbN2SdOj5GNMkFRP1EzypybxgMWZYRBEcmxrsC5fhm7kLR3cXHSyMml 0Zq6ILdbJwDaJjWBMe3gwQCsrLodILgzEXOq/R1R+xRcm4sLgIwSn1sLj3LdbNamNQ+rKcg /AbDTdDj4qW6VgsaKoU5Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:Lx8cwdssJtM=:0FMNwAN48UJP6infa2tHYg xeU1qF8k2SuQQeUzOfx8Zfjvd9uiI+7nFUzWKKqIHDyqoXrmDGNItowIUHeXKYgGnRCLFiOb1 7zYzQjUah3mvWDbRsc+2fr/Xp/QfWg11TcmMh2PnDO8DJImUjVFn9dMcnsx/cqaY2fiLcpANU I3BMH4tkccVNcfiHFtQ4dxOLhKafB9FH1YYYql8emThRzQIjJ3F6XpJa59By7mZ8s+D1J5lrq vHZ/rKFjX3rzt10ShdL6NGUnhh1+juoEW0pRn6YJBijRdov33dnTmBekJDdXuvmhQ8BQ13qX4 nWMkoO60FniI31YwLHoXqObXXtP1zm+Xv7iAzry7he7zrHCl2fhaXbOHJXj4nYzET0YpNBn1V opY/Sk+NtJkRRMmZ/m3mGLHh7wfm+Xg4auPR6Sk83idWKaRG50VhBwukf/JIN4D4ntFXgsDoM sk2CxskqMbDvaw8kMGoqhseKRo54Uz155WKMuEW38XeMJTfrhHXFGSEJ7MRWdv7/MtF7gM+ZR MFU7qB68cY9lqaz5LHbc1S7Q/3rLVP4vtrN+aFYBz+13mcLp+RA40ZaRiwSrU2OMUupPuN/D7 PywueB00J+binMgD6w/JI/lecVBJeIrNDSZvrcBeshDtfZF8c5uAvVfW7oEIx+rnKa5uOCXkv iyWH5pYE0Zpm9+XdgjYaRPaP1SmACz+ENHdBLMUnkNAbysyCQKfiNSu+zegW26YOw5dTddzWy XVoIsvxQxnDABSGYEm0UfX99muH1w3jYf+ygEA== Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The CONFIG_64BIT_TIME option is defined on all architectures, and can be removed for simplicity now. Signed-off-by: Arnd Bergmann --- This would make sense for 5.2, or could be part of a later cleanup series when I have more patches for the remaining y2038 bits --- arch/Kconfig | 8 -------- fs/aio.c | 2 +- ipc/syscall.c | 2 +- kernel/time/hrtimer.c | 2 +- kernel/time/time.c | 4 ++-- net/socket.c | 2 +- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 9092e0ffe4d3..23ee740182aa 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -763,14 +763,6 @@ config OLD_SIGACTION config COMPAT_OLD_SIGACTION bool -config 64BIT_TIME - def_bool y - help - This should be selected by all architectures that need to support - new system calls with a 64-bit time_t. This is relevant on all 32-bit - architectures, and 64-bit architectures as part of compat syscall - handling. - config COMPAT_32BIT_TIME def_bool !64BIT || COMPAT help diff --git a/fs/aio.c b/fs/aio.c index 3490d1fa0e16..b1b949ae1a93 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -2057,7 +2057,7 @@ static long do_io_getevents(aio_context_t ctx_id, * specifies an infinite timeout. Note that the timeout pointed to by * timeout is relative. Will fail with -ENOSYS if not implemented. */ -#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) +#ifdef CONFIG_64BIT SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, long, min_nr, 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)) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 41dfff23c1f9..61f03faf783a 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1749,7 +1749,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp, return ret; } -#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) +#ifdef CONFIG_64BIT SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp, struct __kernel_timespec __user *, rmtp) diff --git a/kernel/time/time.c b/kernel/time/time.c index 74105fa3ce80..a4c72577aa92 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -264,7 +264,7 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv, } #endif -#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) +#ifdef CONFIG_64BIT SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p) { struct __kernel_timex txc; /* Local copy of parameter */ @@ -871,7 +871,7 @@ int get_timespec64(struct timespec64 *ts, ts->tv_sec = kts.tv_sec; /* Zero out the padding for 32 bit systems or in compat mode */ - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) + if (in_compat_syscall()) kts.tv_nsec &= 0xFFFFFFFFUL; ts->tv_nsec = kts.tv_nsec; diff --git a/net/socket.c b/net/socket.c index a180e1a9ff23..2ff80e03d97b 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2787,7 +2787,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],