lkml.org 
[lkml]   [2017]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] time: use do_settimeofday64 internally
Date
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@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 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
\
 
 \ /
  Last update: 2017-10-13 20:35    [W:0.034 / U:0.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site