From patchwork Fri Jan 18 16:18:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 156004 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3441924jaa; Fri, 18 Jan 2019 08:22:10 -0800 (PST) X-Google-Smtp-Source: ALg8bN65TVRIWMpdUGI9eLR8uvnOQhiz9ZGPvAQLRA2jPdc2xv5J2sR5uAurW+8qjWgpKOFIXUeq X-Received: by 2002:a62:cf02:: with SMTP id b2mr20635118pfg.183.1547828530096; Fri, 18 Jan 2019 08:22:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547828530; cv=none; d=google.com; s=arc-20160816; b=zBHTqZ/RK/xmUbKJndSwDCYll+6/pQ/ialEAsqkZCgNZ0dGc57G3vHUl0lpu2M+cAc SPB8XtWbJsGNxLzxy1IcAm8A473CXaqDRSrPlNuFnklArkZA0tzqv6SreyuSJtNM8ch/ AX5WJVMH0fm3WXsATMP3gt9EW4VSz098yh8JMMwS/IFZar+WOJbO5ICFVxCuJH8goaaL 1IT+SGQhhuiXbKOTvhudQb3cW6XY7ARQdnSfpbirv0xIEMQG7pbohVXX82gkDjG9G0Kc SbwzEKpm59BDvUof50rt79s632PcbfGVMZWUBkTeAlE/g5/3R+Xaxyb/tQgn31eJZkOJ NvEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qH+PRlB+gqUkmG8eu/M8RuDkcUg1LVx54vpegdtxro0=; b=H25Qj4ZLaBHwHrnmDfiBimO5loeb3moGouH5BXvGjSMifNyjwixXgdPSzsLMUNHBWc xL/2v4uvWs5aKxTNgAyEv4klqQFIfDZwvSe0SdXCqSnZvu9ZzIAW2k4xXGTa4PnMYwUn f2CerJffrhYwc1ClXijx2wzCtzkky31FVX0iTgplz+wH2aLR/cBOIsJ9Zr5xs8f1FfVQ AqYRoDZzyg5LdqyVAtmdmUO2w/+Dmagfg0TubZgxY++H8a98HQAeIxcwUUxcFJeYm89l t0HsXfhfscbKnR2k3Q8LuqWAjCTBXSYpSuw/TmYEhvOgrtRJMCNM/j8X3InePJLcT6pY 1X1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i33si5017073pld.329.2019.01.18.08.22.09; Fri, 18 Jan 2019 08:22:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728143AbfARQWH (ORCPT + 10 others); Fri, 18 Jan 2019 11:22:07 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:47805 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728720AbfARQVN (ORCPT ); Fri, 18 Jan 2019 11:21:13 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MI5YH-1gz3CJ1jIl-00FCrc; Fri, 18 Jan 2019 17:19:52 +0100 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@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 Subject: [PATCH v2 27/29] y2038: remove struct definition redirects Date: Fri, 18 Jan 2019 17:18:33 +0100 Message-Id: <20190118161835.2259170-28-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190118161835.2259170-1-arnd@arndb.de> References: <20190118161835.2259170-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:EG3noAGakGQOsRQ5AkLHyXRUkGijSSB6s3eFNDqHNQyvbIBTL7m JfLmqyrr1yUW0y7/bJUOCIGESoJzPxNKSv3gPY+AYO56cuN9R1BQnLcflkpPuxKXL/exW87 uKbBZp6bBdkWIfOuXikfahoV+9f40jWboNWbx4oPta+8B4VOEdb4lD8U/m3ozWkbmbkaYJD UyoygynpmqesVKKGGQlVg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:56kzD9MVFwU=:6aDO/AkjMabav72O9jx7MK U0LyhYNJzvpGD6Kghl69p0RWKxOMgrSkvV8EsPKrcxQ3+KJ2oJTwVPE0uSH86On0XDWbROhFv YhOw/nnbEzWG2NsY7XTgHO+lE8ZHXZT28koU2DqR/yLDCt5BQAFCfijBLGaRcmWGrRQgb4cmm dbtAZ/dQX29Srh/qT+agh8bbkVJMvXb37egxxoGChknwb6mFjq3oIoWHpHmqn9xMqgEF4r8JQ 3pUmmq38fkuvj4sqsKjjVD4WSILFbKNH6m48uCtHB8vLz6mpVq5rK8qpfcqcxms5+p0h0lNPy XA7PrG7lo4/dYnlcIE4wwPdTOT8I+sLf2/EC5HkBt7Vux/p9xv/zPMbLsa6/nbnl5wYhaR9Y+ 1KIFbXamK2OQhAUN3EhhN/86TrYPRsp9j9n2hEBwPYlOaYxEfAMtYwOXuyYAo8TPrBdSULabC XiAo4SntznMkCYQzGRQ9MBR+HkO4IhtaxS/Fl3bwC9olG9NI4kIO5EENU8i4bq1gu6YMFBsid BtfCJIGerqELfzRaPOTOteF7CTnRSISVjvaOsbMLRF9GzbdyvwzX1T3d0LL6Cc46sACk5ZzO4 yi4MhrI0pn5C/3yeGDaHcdeMFzSgQKjodnOqhbo3ZoHxoiMRJPf8SnP6BWP67xl0tROE17JqV E+j1tkEOre45LgmlR2duWG3BntyhzzCBrAzMhj1xKS/swWU7ig5kgNOOz6hmRoSNqpw+XSVOt hOxOmDl1R8vqVXVFucLVmXnU7RaJ0l1PnpBizw== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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(-) -- 2.20.0 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)