Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[karo-tx-linux.git] / kernel / time / time.c

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 25bdd250457192df0a2dfc13e6c9078bb92be0d6..6574bba44b55a2917d37e683c312bf10842f88cb 100644 (file)
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -193,8 +193,8 @@ int do_sys_settimeofday64(const struct timespec64 *tv, const struct timezone *tz
 SYSCALL_DEFINE2(settimeofday, struct timeval __user *, tv,
                struct timezone __user *, tz)
 {
+       struct timespec64 new_ts;
        struct timeval user_tv;
-       struct timespec new_ts;
        struct timezone new_tz;
 
        if (tv) {
@@ -212,7 +212,7 @@ SYSCALL_DEFINE2(settimeofday, struct timeval __user *, tv,
                        return -EFAULT;
        }
 
-       return do_sys_settimeofday(tv ? &new_ts : NULL, tz ? &new_tz : NULL);
+       return do_sys_settimeofday64(tv ? &new_ts : NULL, tz ? &new_tz : NULL);
 }
 
 SYSCALL_DEFINE1(adjtimex, struct timex __user *, txc_p)