summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/systohc.c
diff options
context:
space:
mode:
authorXunlei Pang <pang.xunlei@linaro.org>2015-01-22 02:31:55 +0000
committerJohn Stultz <john.stultz@linaro.org>2015-01-23 17:21:57 -0800
commit9a4a445e30f0b601ca2d9433274047cbf48ebf9e (patch)
treeb02b62d1598b6a84332d527ec7e9ba996948d084 /drivers/rtc/systohc.c
parent966301a23ef8ff0a4c5f71b585dafbf334808574 (diff)
downloadlinux-stable-9a4a445e30f0b601ca2d9433274047cbf48ebf9e.tar.gz
linux-stable-9a4a445e30f0b601ca2d9433274047cbf48ebf9e.tar.bz2
linux-stable-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 'drivers/rtc/systohc.c')
-rw-r--r--drivers/rtc/systohc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/systohc.c b/drivers/rtc/systohc.c
index bf3e242ccc5c..eb71872d0361 100644
--- a/drivers/rtc/systohc.c
+++ b/drivers/rtc/systohc.c
@@ -20,16 +20,16 @@
*
* If temporary failure is indicated the caller should try again 'soon'
*/
-int rtc_set_ntp_time(struct timespec now)
+int rtc_set_ntp_time(struct timespec64 now)
{
struct rtc_device *rtc;
struct rtc_time tm;
int err = -ENODEV;
if (now.tv_nsec < (NSEC_PER_SEC >> 1))
- rtc_time_to_tm(now.tv_sec, &tm);
+ rtc_time64_to_tm(now.tv_sec, &tm);
else
- rtc_time_to_tm(now.tv_sec + 1, &tm);
+ rtc_time64_to_tm(now.tv_sec + 1, &tm);
rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
if (rtc) {