From patchwork Fri Oct 13 18:34:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 115822 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1011031edb; Fri, 13 Oct 2017 11:35:08 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBX2+wE+5OQx9nnQgsQsjAWsksVZKVzGS9FlZQ8wydfOQbty5RBqK9+I3WT3jYXp363Mstt X-Received: by 10.99.136.198 with SMTP id l189mr1978522pgd.165.1507919708616; Fri, 13 Oct 2017 11:35:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507919708; cv=none; d=google.com; s=arc-20160816; b=PDwMndl7YPh2+cc/O5DeobF38vm3JkECzXyIq4qJNsYv3GlrzoMBQ8c7gdzwbgs6T/ GNvKhSd9EJTuPp4RG+L9HmLqntdeMysfK05E2+aHS1u9kOe69iOg6iHVPG2HyGO/xpBo rMD76S+OgXiZ7jBJooAZVW2SOJlobj3c/Xb4tqfvL6yCyVuL/bUpj73G8sUA9kBcp8lK DuW1UkFJvTjIUGOOpKNrT9tgKRQt8WEeYAQt1tx0ITHWAhXzBqyeFrjn99b2ECqIngLw gyqaqrVu5kTiMVvOoO8lnuvF0vLvcFHRjmHlvzJS8SylVTRF7ts4epmJEnVDZQIq8K7h lXrw== 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=RQw/hQ+opgBrH0QKd6mmYsbIzPf6lFBAJ5LxdeqCKNY=; b=S6Bp8yBmD6/ZUxzBxnRwDWFevd6TzPySN4YTqYH37mAkrZbkuB1vbsk+GCgrk9y5ep IOrdjvjEHcHsCIAj3S/RUNbNpjVaV1f6rki4PjPNkMDFJmwB2dSuthtAT31liOBbD59L lVg+fmuqO5xjMKwZBygBtb92D+Y5lN5//xYtJGoI72K4E4LWBKOhwjvce4Ii21ljYI3f KEevipcECu/m+PYhw6grX3mMhra5ii5FBaqWDJBXyQlOttnB7EioZ+YONEQVY84MSWY7 6hNShaTTqoOIHREFJNtEGySpq1pkYZanjkHZ7MRLBqlVOZxpImhh7kumypUWfquBwfoz 313Q== 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 137si875795pgd.277.2017.10.13.11.35.08; Fri, 13 Oct 2017 11:35:08 -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 S1752474AbdJMSfG (ORCPT + 27 others); Fri, 13 Oct 2017 14:35:06 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:63796 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751306AbdJMSfF (ORCPT ); Fri, 13 Oct 2017 14:35:05 -0400 Received: from wuerfel.lan ([46.223.139.202]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M2M3o-1dDa8Y2uGK-00s97h; Fri, 13 Oct 2017 20:34:54 +0200 From: Arnd Bergmann To: John Stultz , Thomas Gleixner Cc: y2038@lists.linaro.org, Arnd Bergmann , Stephen Boyd , Al Viro , Deepa Dinamani , Frederic Weisbecker , linux-kernel@vger.kernel.org Subject: [PATCH] time: use do_settimeofday64 internally Date: Fri, 13 Oct 2017 20:34:35 +0200 Message-Id: <20171013183452.3635956-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:+FmUd4+YY49sxSwLO+ZmAP6xxYi+z/ZJ0VksXD6yjAxmwTPgiM0 rPs8JjDjOxutwXNblDF9qq7d4kFPV7D+B72hb4pGK/J8HP7VI5Tpxx97xRLRHZp6oYWXZUP JD6vRXcAsv+xDUe7hiZDHSZqVFiXyPW/aHTsgWeI4jbDFBjorE7QLeKlpr+HrHUD5p8s5BM 3C1OScqHIINMxZ6jIpUSQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:NgzHGcnskPc=:CWMQZXaBUmKM/UxNTce/EB 5//yCMP9gv2JtTn8p4e4+UkCcDoeQfHsrwRpleRrwRnR3fDAuBfY8N+7L9sEeAnfxAJvRuM8t VRDcMUfAjen1A+Lz2/oEC/akyszlU9hYeuE3Dntf6iFiD31jFDU6JFBsDYqRX+NcsNkgQZhNW o0YPLWdcgDg8eEI2vTFE8jro+3X4zUDQsFaVZb9QCSlLXVVkSBBTTsihjKU4dYsgUrTnTWiAL Ni5Pvn9EqZjYiXZaA3rI2s797J9Jv0bw+4uG7E7/ltEcYvz0rHQhgWSgfv36rwId3TkinYyfF 63JC/SvX5158cTbUqbvYDq12YAAnWYLd5+/QZ0b6tsoIvTR5Hd9vXlvHlK3oHVeKQ+9GRBYKH HiP1jSC7h2g8AUAG5MJIJiYk1w1zh3uG/odTzUYlXkzmBZyQ+tre7bHFtdaQ6QF31nl9dIckB gCPaJKzQgK6W+MgHXKM1sS/oZIsfISa1USk0bugRklq1DPv9dU6faoGPDqx/bM+oHDicGrV0+ hmHGAZ+vj306ctYFlUeuEEydRaiE46xOGk3GxYznzxq6bAZK/6VOGCJE5bh/w9YGBbFB09lpg y9OpzaAGI9/xoDEH6+wD49J6IxwC5Pi0/PmRG42CcMqDveoLvFdcTUXQGMw11N8U6rhIjPyN1 3FSr78UE52IjUmlqWbhzoDD5AZiHDu+SSaeP9aZhQiqC4kvzbR7sK5iOjkMMvi6rEitEVlML+ qXn4bP7DzOIIZQVazF/8/9fCY8/EhnCZKcBLWg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org do_settimeofday is a wrapper around do_settimeofday64, so we can simply call that function directly, and kill off the wrapper once the last user is one. Signed-off-by: Arnd Bergmann --- kernel/time/time.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/kernel/time/time.c b/kernel/time/time.c index 0ec7087fe85b..e0ad6922373d 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -82,7 +82,7 @@ SYSCALL_DEFINE1(time, time_t __user *, tloc) SYSCALL_DEFINE1(stime, time_t __user *, tptr) { - struct timespec tv; + struct timespec64 tv; int err; if (get_user(tv.tv_sec, tptr)) @@ -90,11 +90,11 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr) tv.tv_nsec = 0; - err = security_settime(&tv, NULL); + err = security_settime64(&tv, NULL); if (err) return err; - do_settimeofday(&tv); + do_settimeofday64(&tv); return 0; } @@ -122,7 +122,7 @@ COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc) COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) { - struct timespec tv; + struct timespec64 tv; int err; if (get_user(tv.tv_sec, tptr)) @@ -130,11 +130,11 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) tv.tv_nsec = 0; - err = security_settime(&tv, NULL); + err = security_settime64(&tv, NULL); if (err) return err; - do_settimeofday(&tv); + do_settimeofday64(&tv); return 0; }