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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: Frederic Weisbecker <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: John Stultz <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Deepa Dinamani <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 44a8c1402133be79d00fd6e66eb5825404277185..cfe3d3e4679f0458a1d2d1b9e744af4f95d0d2e8 100644 (file)
--- 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;
 }