[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20171013183452.3635956-1-arnd@arndb.de>
Date: Fri, 13 Oct 2017 20:34:35 +0200
From: Arnd Bergmann <arnd@...db.de>
To: John Stultz <john.stultz@...aro.org>,
Thomas Gleixner <tglx@...utronix.de>
Cc: y2038@...ts.linaro.org, Arnd Bergmann <arnd@...db.de>,
Stephen Boyd <sboyd@...eaurora.org>,
Al Viro <viro@...iv.linux.org.uk>,
Deepa Dinamani <deepa.kernel@...il.com>,
Frederic Weisbecker <fweisbec@...il.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH] time: use do_settimeofday64 internally
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 <arnd@...db.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 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;
}
--
2.9.0
Powered by blists - more mailing lists