From patchwork Thu Jan 10 17:22:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10756389 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 98D436C5 for ; Thu, 10 Jan 2019 17:28:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DBE729C18 for ; Thu, 10 Jan 2019 17:28:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CA8429C1F; Thu, 10 Jan 2019 17:28:56 +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=unavailable 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 145B129C18 for ; Thu, 10 Jan 2019 17:28:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730034AbfAJR2r (ORCPT ); Thu, 10 Jan 2019 12:28:47 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:60231 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729844AbfAJR2n (ORCPT ); Thu, 10 Jan 2019 12:28:43 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MyK9S-1hVBFV3ORA-00yftj; Thu, 10 Jan 2019 18:22:34 +0100 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , mattst88@gmail.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, tony.luck@intel.com, fenghua.yu@intel.com, geert@linux-m68k.org, monstr@monstr.eu, paul.burton@mips.com, deller@gmx.de, benh@kernel.crashing.org, mpe@ellerman.id.au, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, dalias@libc.org, davem@davemloft.net, luto@kernel.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, jcmvbkbc@gmail.com, akpm@linux-foundation.org, deepa.kernel@gmail.com, ebiederm@xmission.com, firoz.khan@linaro.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 09/11] y2038: remove struct definition redirects Date: Thu, 10 Jan 2019 18:22:14 +0100 Message-Id: <20190110172216.313063-10-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190110172216.313063-1-arnd@arndb.de> References: <20190110172216.313063-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:JFxfraV6ycMtD0g5CS6YrYFoYtT89QsNLLyOITHqT41z422VdUk LrBF7KqupsEuf8G5AWi7KnizntYiJSGk3aSzCC18HSoU1fI0dBkUdiedPGCRfw3YuFKI+WZ sn0EDd+y1lKagAVy7SNwNYRebBx2PiBsDVXU4q12xPKfpGF8+eECy1CpQL8GH5DadiLP175 NmavfIAHIzJ7u+sIpQZQw== X-UI-Out-Filterresults: notjunk:1;V03:K0:y8V2uvPD0Lc=:23pXewO+qOOTuEOmwKX+jP kgFisfr5zRBzZZuJjaXma9ROzEuNKJT2knnr35Twm0RUoMnp2hqucxVC4rdVPXcNcTFpR0Sfn rbiKUkJQY9CuLG2wUcNPD+ombhmXiQiiGbLZeDnbamWSfrIspAq9PUXgW0Y/ouXVH1P3dFlOp 85WCiTvqjUYqOOBL+9CGh1fcLCZ/EEOJtObyYQNX0+bmhrvIuAU3ekKvUcqhvK6lTH/VjnfzY 9wQa7aBxZ9PkfJGY2lxmqAFTNzkF504WGbXZiK9Yp6i1YITTVJwxIH/MRyRCPS4JuiOFrU3MV eSef3mCQxeqKEwaIgUKdBjiWp2LcDVYSOiiLSrhzrTuVuIUFOBGKnqSJxwaH64VunRfjbBNok 8xOTj6nxAs3HyrQSMqZYqiKmCxDi7uEm+Ti3wb1XaDfSyJbDj5++PdawZ/lqgHZA533+Szcg0 cLDPJFjWBH0hSQE5+8BemRIEY8p3MQLCxb4v52DxN9STy5wXCTvJz0a9IN1j7O46SZYI8P3L8 fKImA+62+KENNt62zka0WGT/U7MX3u39of/hTBUX08+nlXxIZD2IvdMW+eP9N3JNKXPXRxZaW 0h+aYQMdseiR8JnYsU622Afkfc4GAL5wsPKjxa9o3fGH75rij5I3HvZ7We3w+TXMOgQg6eHrd E5ZWfhW/S4j13sg0sUJp7puicvoDt9Sb0mokUuCxN+zNN/GwtKnfbjnEWHaeGCJRvIsy+QFu1 ntldZWOn6osKLq9kRorjVCdWnRCLvihEdGNTLw== 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 We now use 64-bit time_t on all architectures, so the __kernel_timex, __kernel_timeval and __kernel_timespec redirects can be removed after having served their purpose. This makes it all much less confusing, as the __kernel_* types now always refer to the same layout based on 64-bit time_t across all 32-bit and 64-bit architectures. Signed-off-by: Arnd Bergmann --- include/linux/time64.h | 8 -------- include/linux/timex.h | 7 ------- include/uapi/linux/time.h | 4 ---- include/uapi/linux/timex.h | 2 -- 4 files changed, 21 deletions(-) diff --git a/include/linux/time64.h b/include/linux/time64.h index 05634afba0db..f38d382ffec1 100644 --- a/include/linux/time64.h +++ b/include/linux/time64.h @@ -7,14 +7,6 @@ typedef __s64 time64_t; typedef __u64 timeu64_t; -/* CONFIG_64BIT_TIME enables new 64 bit time_t syscalls in the compat path - * and 32-bit emulation. - */ -#ifndef CONFIG_64BIT_TIME -#define __kernel_timespec timespec -#define __kernel_itimerspec itimerspec -#endif - #include struct timespec64 { diff --git a/include/linux/timex.h b/include/linux/timex.h index 4aff9f0d1367..ce0859763670 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -53,13 +53,6 @@ #ifndef _LINUX_TIMEX_H #define _LINUX_TIMEX_H -/* CONFIG_64BIT_TIME enables new 64 bit time_t syscalls in the compat path - * and 32-bit emulation. - */ -#ifndef CONFIG_64BIT_TIME -#define __kernel_timex timex -#endif - #include #define ADJ_ADJTIME 0x8000 /* switch between adjtime/adjtimex modes */ diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h index 6b56a2208be7..b03f8717c312 100644 --- a/include/uapi/linux/time.h +++ b/include/uapi/linux/time.h @@ -42,19 +42,15 @@ struct itimerval { struct timeval it_value; /* current value */ }; -#ifndef __kernel_timespec struct __kernel_timespec { __kernel_time64_t tv_sec; /* seconds */ long long tv_nsec; /* nanoseconds */ }; -#endif -#ifndef __kernel_itimerspec struct __kernel_itimerspec { struct __kernel_timespec it_interval; /* timer period */ struct __kernel_timespec it_value; /* timer expiration */ }; -#endif /* * legacy timeval structure, only embedded in structures that diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h index a1c6b73016a5..9f517f9010bb 100644 --- a/include/uapi/linux/timex.h +++ b/include/uapi/linux/timex.h @@ -97,7 +97,6 @@ struct __kernel_timex_timeval { long long tv_usec; }; -#ifndef __kernel_timex struct __kernel_timex { unsigned int modes; /* mode selector */ int :32; /* pad */ @@ -131,7 +130,6 @@ struct __kernel_timex { int :32; int :32; int :32; int :32; int :32; int :32; int :32; }; -#endif /* * Mode codes (timex.mode)