summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-13 20:34:35 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-10-17 17:22:28 +0200
commit4eb1bca1793385b8caff4b2e1f19b31a013dd1ec (patch)
treefc199123fe67460de60b4ef9470fdd4f9b03c86b /kernel/time
parentfe460423438b62eb7440d994ab19a9f444e6280d (diff)
downloadop-kernel-dev-4eb1bca1793385b8caff4b2e1f19b31a013dd1ec.zip
op-kernel-dev-4eb1bca1793385b8caff4b2e1f19b31a013dd1ec.tar.gz
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 <arnd@arndb.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: y2038@lists.linaro.org Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: John Stultz <john.stultz@linaro.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Deepa Dinamani <deepa.kernel@gmail.com> Link: https://lkml.kernel.org/r/20171013183452.3635956-1-arnd@arndb.de
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/time.c12
1 files 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;
}
OpenPOWER on IntegriCloud