diff mbox series

[2/3] time: use ktime_get_real_seconds() in time syscall

Message ID 20180618140811.2998503-2-arnd@arndb.de
State Accepted
Commit f5a89295e2f566d8e9f1d4f3d524d8d3c966958c
Headers show
Series [1/3] posix-timers: fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME | expand

Commit Message

Arnd Bergmann June 18, 2018, 2:08 p.m. UTC 
Both get_seconds() and do_gettimeofday() are deprecated. Let's
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>

---
 kernel/time/time.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-- 
2.9.0
diff mbox series

Patch

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 8e4f3fd2f84b..90867ece5c09 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))