summaryrefslogtreecommitdiffstats
path: root/arch/mips/sibyte/swarm/rtc_m41t81.c
diff options
context:
space:
mode:
authorBaolin Wang2018-05-07 11:28:27 +0200
committerJames Hogan2018-05-15 00:58:23 +0200
commit09adad17191942cac01ccfbb897b976ac8f42c22 (patch)
tree779d55a325e59896c032ce5591db659ad6378ed2 /arch/mips/sibyte/swarm/rtc_m41t81.c
parentMIPS: sni: Remove the read_persistent_clock() (diff)
downloadkernel-qcow2-linux-09adad17191942cac01ccfbb897b976ac8f42c22.tar.gz
kernel-qcow2-linux-09adad17191942cac01ccfbb897b976ac8f42c22.tar.xz
kernel-qcow2-linux-09adad17191942cac01ccfbb897b976ac8f42c22.zip
MIPS: Convert read_persistent_clock() to read_persistent_clock64()
Since struct timespec is not y2038 safe on 32bit machines, this patch converts read_persistent_clock() to read_persistent_clock64() using struct timespec64, as well as converting mktime() to mktime64(). Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Huacai Chen <chenhc@lemote.com> Cc: Paul Burton <paul.burton@mips.com> Cc: linux-mips@linux-mips.org Signed-off-by: James Hogan <jhogan@kernel.org>
Diffstat (limited to 'arch/mips/sibyte/swarm/rtc_m41t81.c')
-rw-r--r--arch/mips/sibyte/swarm/rtc_m41t81.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c
index e62466445f08..aa27a2226472 100644
--- a/arch/mips/sibyte/swarm/rtc_m41t81.c
+++ b/arch/mips/sibyte/swarm/rtc_m41t81.c
@@ -188,7 +188,7 @@ int m41t81_set_time(unsigned long t)
return 0;
}
-unsigned long m41t81_get_time(void)
+time64_t m41t81_get_time(void)
{
unsigned int year, mon, day, hour, min, sec;
unsigned long flags;
@@ -218,7 +218,7 @@ unsigned long m41t81_get_time(void)
year += 2000;
- return mktime(year, mon, day, hour, min, sec);
+ return mktime64(year, mon, day, hour, min, sec);
}
int m41t81_probe(void)