lkml.org 
[lkml]   [2017]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:timers/core] time: Use do_settimeofday64() internally
Commit-ID:  4eb1bca1793385b8caff4b2e1f19b31a013dd1ec
Gitweb: https://git.kernel.org/tip/4eb1bca1793385b8caff4b2e1f19b31a013dd1ec
Author: Arnd Bergmann <arnd@arndb.de>
AuthorDate: Fri, 13 Oct 2017 20:34:35 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
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 <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

---
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;
}

\
 
 \ /
  Last update: 2017-10-17 17:47    [W:0.042 / U:0.572 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site