diff options
| author | Xunlei Pang <pang.xunlei@linaro.org> | 2015-01-22 02:31:55 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2015-01-23 17:21:57 -0800 |
| commit | 9a4a445e30f0b601ca2d9433274047cbf48ebf9e (patch) | |
| tree | b02b62d1598b6a84332d527ec7e9ba996948d084 /kernel/time/ntp.c | |
| parent | 966301a23ef8ff0a4c5f71b585dafbf334808574 (diff) | |
| download | linux-9a4a445e30f0b601ca2d9433274047cbf48ebf9e.tar.gz linux-9a4a445e30f0b601ca2d9433274047cbf48ebf9e.tar.bz2 linux-9a4a445e30f0b601ca2d9433274047cbf48ebf9e.zip | |
rtc: Convert rtc_set_ntp_time() to use timespec64
rtc_set_ntp_time() uses timespec which is y2038-unsafe,
so modify to use timespec64 which is y2038-safe, then
replace rtc_time_to_tm() with rtc_time64_to_tm().
Also adjust all its call sites(only NTP uses it) accordingly.
Cc: pang.xunlei <pang.xunlei@linaro.org>
Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
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) |