diff mbox series

m68k: Use read_persistent_clock64() instead of read_persistent_clock()

Message ID d4493391d55b44b53da4a7c4a7fd9b865b5d57cd.1519799224.git.baolin.wang@linaro.org
State New
Headers show
Series m68k: Use read_persistent_clock64() instead of read_persistent_clock() | expand

Commit Message

(Exiting) Baolin Wang Feb. 28, 2018, 6:29 a.m. UTC 
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>

---
 arch/m68k/kernel/time.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
1.7.9.5
diff mbox series

Patch

diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 87160b4..8cd79c9 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -71,7 +71,7 @@  static irqreturn_t timer_interrupt(int irq, void *dummy)
 	return IRQ_HANDLED;
 }
 
-void read_persistent_clock(struct timespec *ts)
+void read_persistent_clock64(struct timespec64 *ts)
 {
 	struct rtc_time time;
 	ts->tv_sec = 0;
@@ -82,7 +82,7 @@  void read_persistent_clock(struct timespec *ts)
 
 		if ((time.tm_year += 1900) < 1970)
 			time.tm_year += 100;
-		ts->tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday,
+		ts->tv_sec = mktime64(time.tm_year, time.tm_mon, time.tm_mday,
 				      time.tm_hour, time.tm_min, time.tm_sec);
 	}
 }