From: Arnd Bergmann <arnd@arndb.de>
To: Thomas Gleixner <tglx@linutronix.de>,
John Stultz <john.stultz@linaro.org>
Cc: y2038@lists.linaro.org, Arnd Bergmann <arnd@arndb.de>,
Stephen Boyd <sboyd@kernel.org>,
Deepa Dinamani <deepa.kernel@gmail.com>,
Al Viro <viro@zeniv.linux.org.uk>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] time: use ktime_get_real_seconds() in time syscall
Date: Mon, 18 Jun 2018 16:08:00 +0200 [thread overview]
Message-ID: <20180618140811.2998503-2-arnd@arndb.de> (raw)
In-Reply-To: <20180618140811.2998503-1-arnd@arndb.de>
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(-)
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))
--
2.9.0
next prev parent reply other threads:[~2018-06-18 14:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 14:07 [PATCH 1/3] posix-timers: fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME Arnd Bergmann
2018-06-18 14:08 ` Arnd Bergmann [this message]
2018-06-19 8:00 ` [tip:timers/core] time: Use ktime_get_real_seconds() in time syscall tip-bot for Arnd Bergmann
2018-06-18 14:08 ` [PATCH 3/3] timekeeping: use ktime_get_real_ts64() instead of getnstimeofday64() Arnd Bergmann
2018-06-19 8:01 ` [tip:timers/core] timekeeping: Use " tip-bot for Arnd Bergmann
2018-06-19 7:27 ` [tip:timers/urgent] posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME tip-bot for Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180618140811.2998503-2-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=deepa.kernel@gmail.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@kernel.org \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).