From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E752C43219 for ; Mon, 29 Apr 2019 13:21:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 771D22053B for ; Mon, 29 Apr 2019 13:21:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728128AbfD2NVK (ORCPT ); Mon, 29 Apr 2019 09:21:10 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:48301 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbfD2NVK (ORCPT ); Mon, 29 Apr 2019 09:21:10 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1MAORn-1hVmNc2b6p-00BvMr; Mon, 29 Apr 2019 15:20:59 +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 , Lukasz Majewski , Stepan Golosunov Subject: [PATCH 2/2] y2038: remove CONFIG_64BIT_TIME Date: Mon, 29 Apr 2019 15:19:38 +0200 Message-Id: <20190429131951.471701-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190429131951.471701-1-arnd@arndb.de> References: <20190429131951.471701-1-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:TBoHavGLKnFBHZbaXkDqUZafeUDxmU7bCC0Zk3iIoHCwVb3hms/ QbfDTmbFPAyzGjnN/nHi9i4cfVOnHXNlmIll11jMmBrfdNFGrAuHuUEstgWmXAkG0RsfbWW 0Hq0Y4SZt0DBCx7LDTjBfaAsbE52TZKvy4I6Y6A760irknTPmccdSV7B6DpSUet7tLFlIdd dXB64aLI8YKyM9JHB/MSw== X-UI-Out-Filterresults: notjunk:1;V03:K0:eYC32MWpqyo=:zW9bX10nClPm7JlH4Wj49X D195iIGqB/iyM7MYOwLOSd0hBY5DPkTxMX7yeyjhL23CxtlaSkX62Kh1KbvqIopszmLTBsq7/ guX7XJSo9eY1LMbzo1XgYphwQYM7Wn4kqxGKiUjrAKXhJk1hT5LBbc4iQ7Oqbz5zaHecKcl7L XJwP2ln6xmpP0Pxt1GeGlwsNDrXJPFc4Nlha5ayeNX+AISx+X3YMPFk5iDIsxc1RidrJVhe8z oOitZLNWVPtfYDYE+tlrnHTfOq0d58W2CYPadD8YyhuY7q2sW7If2d+SuC1JMOCsLMgSqVlvC HQ2xzT8qdcB3iOOgjYEksd7Ge4ie9sd/3kdYAZWSVlJaOVVJmtlzXzRJUC2FDG0JL/jJD6A5M 4aGdvdLxVOZMvIOPhNth0fkg9f1IaS25cNARd317huHoi0oSdCfThJwSJITdITWALegjLF+dF QHifSSFP+WJv7oqkm5Yw0+kS6+cov5oBsVKmZfqZt7F+ABGCDJCNGye4XcCfGwW8BK6pudObH tatS5bdPpnGl6KGUEfqq6cBYShh44C42a7gv8obp2zcJ9J26VdMEeFPV7pLRSY5Uw1HR30LGE vCxxgchAcLfXkO/2oT9zAV1N4A6yne+u5r1ORrG7tbsCA2H2AUH//3+wg/roO/xmiTKN1ANU0 Ej1zRvXB3HD6yAe6bJuYn/75rn8tPgX4Ved6eM7SZRlDMbwEbJb0j10ghSxsWTIBaZH4Jfv7F +825g9MTBIOInXZ8Bqj1qwEXv/z3cvMG068EFw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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], -- 2.20.0