diff options
author | Thomas Gleixner | 2015-01-24 10:11:12 +0100 |
---|---|---|
committer | Thomas Gleixner | 2015-01-24 10:11:12 +0100 |
commit | fe31fca35d6af9176eec0024fac2ceeaacbc8639 (patch) | |
tree | 8a08632cb92784bb8ca6ffab0a5ecca65ebbd8e9 /kernel/time/ntp.c | |
parent | hrtimer: Prevent stale expiry time in hrtimer_interrupt() (diff) | |
parent | rtc: Convert rtc_set_ntp_time() to use timespec64 (diff) | |
download | kernel-qcow2-linux-fe31fca35d6af9176eec0024fac2ceeaacbc8639.tar.gz kernel-qcow2-linux-fe31fca35d6af9176eec0024fac2ceeaacbc8639.tar.xz kernel-qcow2-linux-fe31fca35d6af9176eec0024fac2ceeaacbc8639.zip |
Merge tag 'fortglx-3.20-time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull time updates from John Stultz for 3.20:
* ktime division optimization
* Expose a few more y2038-safe timekeeping interfaces
* RTC core changes to address y2038
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r-- | kernel/time/ntp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 87a346fd6d61..183dfe2191c6 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -488,13 +488,13 @@ static void sync_cmos_clock(struct work_struct *work) getnstimeofday64(&now); if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec * 5) { - struct timespec adjust = timespec64_to_timespec(now); + struct timespec64 adjust = now; fail = -ENODEV; if (persistent_clock_is_local) adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); #ifdef CONFIG_GENERIC_CMOS_UPDATE - fail = update_persistent_clock(adjust); + fail = update_persistent_clock(timespec64_to_timespec(adjust)); #endif #ifdef CONFIG_RTC_SYSTOHC if (fail == -ENODEV) |