From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936613AbdJQPqa (ORCPT ); Tue, 17 Oct 2017 11:46:30 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41013 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933258AbdJQPq1 (ORCPT ); Tue, 17 Oct 2017 11:46:27 -0400 Date: Tue, 17 Oct 2017 08:43:15 -0700 From: tip-bot for Arnd Bergmann Message-ID: Cc: tglx@linutronix.de, arnd@arndb.de, deepa.kernel@gmail.com, fweisbec@gmail.com, viro@zeniv.linux.org.uk, hpa@zytor.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, mingo@kernel.org, john.stultz@linaro.org Reply-To: tglx@linutronix.de, arnd@arndb.de, deepa.kernel@gmail.com, fweisbec@gmail.com, viro@zeniv.linux.org.uk, hpa@zytor.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, mingo@kernel.org, john.stultz@linaro.org In-Reply-To: <20171013183452.3635956-1-arnd@arndb.de> References: <20171013183452.3635956-1-arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] time: Use do_settimeofday64() internally Git-Commit-ID: 4eb1bca1793385b8caff4b2e1f19b31a013dd1ec X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4eb1bca1793385b8caff4b2e1f19b31a013dd1ec Gitweb: https://git.kernel.org/tip/4eb1bca1793385b8caff4b2e1f19b31a013dd1ec Author: Arnd Bergmann AuthorDate: Fri, 13 Oct 2017 20:34:35 +0200 Committer: Thomas Gleixner CommitDate: Tue, 17 Oct 2017 17:22:28 +0200 time: Use do_settimeofday64() internally do_settimeofday() is a wrapper around do_settimeofday64(), so that function can be called directly. The wrapper can be removed once the last user is gone. Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Cc: y2038@lists.linaro.org Cc: Frederic Weisbecker Cc: Stephen Boyd Cc: John Stultz Cc: Al Viro Cc: Deepa Dinamani Link: https://lkml.kernel.org/r/20171013183452.3635956-1-arnd@arndb.de --- kernel/time/time.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/time/time.c b/kernel/time/time.c index 44a8c14..cfe3d3e 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; }