[tip:timers/core] timekeeping: Use ktime_get_real_ts64() instead of getnstimeofday64()

From: tip-bot for Arnd Bergmann
Date: Tue Jun 19 2018 - 04:01:49 EST


Commit-ID: d30faff900e666f9a6395a159fdd353c02f5bed0
Gitweb: https://git.kernel.org/tip/d30faff900e666f9a6395a159fdd353c02f5bed0
Author: Arnd Bergmann <arnd@xxxxxxxx>
AuthorDate: Mon, 18 Jun 2018 16:08:01 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Tue, 19 Jun 2018 09:56:26 +0200

timekeeping: Use ktime_get_real_ts64() instead of getnstimeofday64()

The two do the same, this moves all users to the newer name for consistency.

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: John Stultz <john.stultz@xxxxxxxxxx>
Cc: y2038@xxxxxxxxxxxxxxxx
Cc: Stephen Boyd <sboyd@xxxxxxxxxx>
Cc: Miroslav Lichvar <mlichvar@xxxxxxxxxx>
Link: https://lkml.kernel.org/r/20180618140811.2998503-3-arnd@xxxxxxxx

---
kernel/time/ntp.c | 6 +++---
kernel/time/timekeeping.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index a09ded765f6c..10a79053e82f 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -502,7 +502,7 @@ static void sched_sync_hw_clock(struct timespec64 now,
{
struct timespec64 next;

- getnstimeofday64(&next);
+ ktime_get_real_ts64(&next);
if (!fail)
next.tv_sec = 659;
else {
@@ -537,7 +537,7 @@ static void sync_rtc_clock(void)
if (!IS_ENABLED(CONFIG_RTC_SYSTOHC))
return;

- getnstimeofday64(&now);
+ ktime_get_real_ts64(&now);

adjust = now;
if (persistent_clock_is_local)
@@ -591,7 +591,7 @@ static bool sync_cmos_clock(void)
* Architectures are strongly encouraged to use rtclib and not
* implement this legacy API.
*/
- getnstimeofday64(&now);
+ ktime_get_real_ts64(&now);
if (rtc_tv_nsec_ok(-1 * target_nsec, &adjust, &now)) {
if (persistent_clock_is_local)
adjust.tv_sec -= (sys_tz.tz_minuteswest * 60);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 4786df904c22..77c436a0070b 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -2310,7 +2310,7 @@ int do_adjtimex(struct timex *txc)
return ret;
}

- getnstimeofday64(&ts);
+ ktime_get_real_ts64(&ts);

raw_spin_lock_irqsave(&timekeeper_lock, flags);
write_seqcount_begin(&tk_core.seq);