time: use do_settimeofday64 internally
PATCH 1/1 time: use do_settimeofday64 internally
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 <[email protected]>
--- kernel/time/time.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/time/time.c +6 -6
@@ -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 ; }
Signature · 1 line
2.9.0
tip-bot for Arnd Bergmann
merge bot[tip:timers/core] time: Use do_settimeofday64() internally
time: Use do_settimeofday64() internally
Commit-ID: 4eb1bca1793385b8caff4b2e1f19b31a013dd1ec Gitweb: https://git.kernel.org/tip/4eb1bca1793385b8caff4b2e1f19b31a013dd1ec Author: Arnd Bergmann <[email protected]> AuthorDate: Fri, 13 Oct 2017 20:34:35 +0200 Committer: Thomas Gleixner <[email protected]> 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 <[email protected]>
Signed-off-by Thomas Gleixner <[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]>
--- kernel/time/time.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/time/time.c +6 -6
@@ -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 ; }