diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-06-18 16:08:00 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-06-19 09:56:26 +0200 |
commit | f5a89295e2f566d8e9f1d4f3d524d8d3c966958c (patch) | |
tree | fead7f5edd20a471c903c86ca7f7b46a2ea22a72 /kernel/time | |
parent | 9ffc59d57228d74809700be6f7ecb1db10292f05 (diff) | |
download | blackbird-op-linux-f5a89295e2f566d8e9f1d4f3d524d8d3c966958c.tar.gz blackbird-op-linux-f5a89295e2f566d8e9f1d4f3d524d8d3c966958c.zip |
time: Use ktime_get_real_seconds() in time syscall
Both get_seconds() and do_gettimeofday() are deprecated. Change the time()
implementation to use the replacement function instead.
Obviously the system call will still overflow in 2038, but this gets us
closer to removing the old helper functions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: y2038@lists.linaro.org
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lkml.kernel.org/r/20180618140811.2998503-2-arnd@arndb.de
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/time.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/time/time.c b/kernel/time/time.c index 6fa99213fc72..b1225db61eb2 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -63,7 +63,7 @@ EXPORT_SYMBOL(sys_tz); */ SYSCALL_DEFINE1(time, time_t __user *, tloc) { - time_t i = get_seconds(); + time_t i = (time_t)ktime_get_real_seconds(); if (tloc) { if (put_user(i,tloc)) @@ -106,11 +106,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr) /* compat_time_t is a 32 bit "long" and needs to get converted. */ COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc) { - struct timeval tv; compat_time_t i; - do_gettimeofday(&tv); - i = tv.tv_sec; + i = (compat_time_t)ktime_get_real_seconds(); if (tloc) { if (put_user(i,tloc)) |