From patchwork Mon Jun 18 14:32:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 138972 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4026473lji; Mon, 18 Jun 2018 07:33:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL4YFQFcPA2d5mhxLEV7fBoS/L7LHGwL/4xd5TayxHtnFPOp/wDoZM0nXj+oroiR3wL7k0Z X-Received: by 2002:a63:6807:: with SMTP id d7-v6mr10959745pgc.7.1529332397689; Mon, 18 Jun 2018 07:33:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529332397; cv=none; d=google.com; s=arc-20160816; b=Voh7df2At1QnX8/oNqbmqis1+nOjMrN1RsWb66NlQrqRhGlhPT8hoyHpw3mrU+Y7zw vQrUxrTQd5MKUaJjB7AUF4F+kgInvPbMKyq7C2QjSRwMJcIC2iJ6H2T1vYFhqre0uF1n j4FLgKjQYFnKgcspYXY5F1blPXIwXoTwKLHNHwPSQRqGIYuIz4nRBAYAMubrEB2eXLoB ytn3916ZlJXjZvAVMQjOWsZrm3IhuwDqCFFFLAfGOgjee47jUPtfw2X1N3+d5T1Q5fAt o+2nrtclYpEhhBK6+O/5ODLmpXXig66qaHXjdMLw2tSdVX8GISahGJRjdX2uZq8k6Wdx +yuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=4ogeXc2TbmZEFwq99YnVtpowV/rKiPxyASQYXhOnc9k=; b=tTTmEgk35bs9xhlv6KGXDug5v252z3RiZ3gshSx5OZEYCPtcD+Mf0CZtRTKkN4J3ZX Ord8oRwqTFcFuyUb9nV9mg6OWZrBQegNWbz2tADoRgv5bHkjQ4Aa0u5Xl57uoG7MMDXu 0rJKA4T7nafpZiz+1AItrjkPEH0kiCnfmeRky4+UXoHLA7tiJ2MY2dgT//N+vC/2Be6I DW73PHTJ4u3kiptQId9zi+vc5cYQG1lIpk1aLJ3Irwm6btyPyTOrytHyG9BTUOxuQWqK zsx488zVZfkQ0WBTcVi6HB5+jxn22FQWrwFTBlK7JurYQJWvFe5w3ojyV+pwZ/ewuLxp Mfow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 u21-v6si14382150pfd.78.2018.06.18.07.33.17; Mon, 18 Jun 2018 07:33:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935148AbeFROdP (ORCPT + 30 others); Mon, 18 Jun 2018 10:33:15 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:33837 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935072AbeFROdM (ORCPT ); Mon, 18 Jun 2018 10:33:12 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mcj5x-1fmB700mET-00Htdb; Mon, 18 Jun 2018 16:32:47 +0200 From: Arnd Bergmann To: Thomas Gleixner Cc: y2038@lists.linaro.org, Arnd Bergmann , Deepa Dinamani , "Eric W. Biederman" , linux-kernel@vger.kernel.org Subject: [PATCH] posix-timers: Use new ktime_get_*_ts64() helpers Date: Mon, 18 Jun 2018 16:32:24 +0200 Message-Id: <20180618143246.3865099-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:6bdONtQglpD7vXCZAWKArAanS0s6iJC5f39/7U5GGeHM58V24+M WN5t1/kgBWJZNiqzZf+Nm17hIRuoZ0ooEbtW5TOM+AKXkj+A8iq1A7yLc6mP9AlWcn7uvar Nq9rHU8NWBgnXDd1tGF4ZzAMoGxMyhhsBjYCACxzAR2fnW9g/0frsvv2+iYvqDpy8bp/dS3 Kyg1I/nW9yXvGTsrFmqEw== X-UI-Out-Filterresults: notjunk:1; V01:K0:lNxvMUgOGuc=:C/SAJ7m79JrPM4iFanYgy3 7xMvUNod/qSM6c+o8LzW6U4NpRAPoV4MCqyynVKNpLxcdC/0X5yRMCBgwPfrHlXHeb3FRZ9z7 ca08QI2JuKc9Jnr17dgJ24SiNBNCrhWoihDiWX4mrie5hE7zsNaHMNsVVFUzyICSNlBw3qYJK sgKHY6AzxnY2rI59I6WjAQBE0Aj/D2S1M7FArsqun/OroAEcH7V7AHpRCV/Kzf2KLXVGct4QS o14862BFUg8Ed/7vORYPl4LwdWuLXN+TtqjA2py2mZKLy/9MBvgcoq3fSd6p4M6km0kwxqGBK DER5JAcLbheJq27nNJiWD1Xf0Gx8/Mve59gxtAnDiYcSMAIhXT0ZmQwIuDKeGmD+5F7GdNmZu JWNx7MutidMMzIkn0btBIChNEOytDseA92tPHjgESM8lmZou84Qpa1RucoJi04W9l1m3ZxC6r Ey6lzOpqqh88gkq3t6VjS1Mo/xYcftTOiOjKM4lyvXq7QrtgXfY17eyQy9eg8beX8Rs6wSrLt ewoipF04norHHAUzdBIO9Sm8Y9H7GVuPCbsCQu9EW/QOPOwbL4dRMpUZV9P0H5vFQDxIB04ZF WHojXP1YRcJF7hHP50hdJVSuXkmVa5jW7B1BAJ2ILddY0dpmLr+vWCeTN7zyzFpH17Mdlb5YF L555Uc/IoyA7SyF7Vocge+R7r9hk2VIGojEXkps4/TsMnvmdwbmKxZZ/erE1q9RZ12+k= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some of the oddly named time accessor functions now have a more consistent naming, which should be used from now on so we can remove the aliases. Signed-off-by: Arnd Bergmann --- kernel/time/posix-stubs.c | 2 +- kernel/time/posix-timers.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c index 26203a705011..706e2c7338d2 100644 --- a/kernel/time/posix-stubs.c +++ b/kernel/time/posix-stubs.c @@ -81,7 +81,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp) ktime_get_ts64(tp); break; case CLOCK_BOOTTIME: - get_monotonic_boottime64(tp); + ktime_get_boottime_ts64(tp); break; default: return -EINVAL; diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index 4cb8316bb042..234fb699caf1 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -228,21 +228,21 @@ static int posix_ktime_get_ts(clockid_t which_clock, struct timespec64 *tp) */ static int posix_get_monotonic_raw(clockid_t which_clock, struct timespec64 *tp) { - getrawmonotonic64(tp); + ktime_get_raw_ts64(tp); return 0; } static int posix_get_realtime_coarse(clockid_t which_clock, struct timespec64 *tp) { - *tp = current_kernel_time64(); + ktime_get_coarse_real_ts64(tp); return 0; } static int posix_get_monotonic_coarse(clockid_t which_clock, struct timespec64 *tp) { - *tp = get_monotonic_coarse64(); + ktime_get_coarse_ts64(tp); return 0; } @@ -254,13 +254,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 * static int posix_get_boottime(const clockid_t which_clock, struct timespec64 *tp) { - get_monotonic_boottime64(tp); + ktime_get_boottime_ts64(tp); return 0; } static int posix_get_tai(clockid_t which_clock, struct timespec64 *tp) { - timekeeping_clocktai64(tp); + ktime_get_clocktai_ts64(tp); return 0; }