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@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: Miroslav Lichvar <mlichvar@redhat.com>
Link: https://lkml.kernel.org/r/20180618140811.2998503-3-arnd@arndb.de

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index a09ded765f6c50f6c0d9ba46c30644b539d1472a..10a79053e82fd259be31024cd627a03f613e1801 100644 (file)
--- 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 4786df904c22d0a8e9473e600efee97244eb5782..77c436a0070b1af10a3ea323734d1cc538dcd8bc 100644 (file)
--- 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);