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>

diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index a2a150e4fbc2867773d7d5c4e57fe95985481ad4..9e992cf1129e51517e6a2fda6a4bd585177673c9 100644 (file)
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -19,7 +19,7 @@
 #include <asm/dec/ioasic.h>
 #include <asm/dec/machtype.h>
 
-void read_persistent_clock(struct timespec *ts)
+void read_persistent_clock64(struct timespec64 *ts)
 {
        unsigned int year, mon, day, hour, min, sec, real_year;
        unsigned long flags;
@@ -54,7 +54,7 @@ void read_persistent_clock(struct timespec *ts)
 
        year += real_year - 72 + 2000;
 
-       ts->tv_sec = mktime(year, mon, day, hour, min, sec);
+       ts->tv_sec = mktime64(year, mon, day, hour, min, sec);
        ts->tv_nsec = 0;
 }
 

diff --git a/arch/mips/include/asm/mc146818-time.h b/arch/mips/include/asm/mc146818-time.h
index 9e1ad26abdc0232482fb39e13e4e688a9487693a..cbf5cec345f1ca55effaf34b7b42a49e5873bbd7 100644 (file)
--- a/arch/mips/include/asm/mc146818-time.h
+++ b/arch/mips/include/asm/mc146818-time.h
@@ -86,7 +86,7 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime)
        return retval;
 }
 
-static inline unsigned long mc146818_get_cmos_time(void)
+static inline time64_t mc146818_get_cmos_time(void)
 {
        unsigned int year, mon, day, hour, min, sec;
        unsigned long flags;
@@ -113,7 +113,7 @@ static inline unsigned long mc146818_get_cmos_time(void)
        spin_unlock_irqrestore(&rtc_lock, flags);
        year = mc146818_decode_year(year);
 
-       return mktime(year, mon, day, hour, min, sec);
+       return mktime64(year, mon, day, hour, min, sec);
 }
 
 #endif /* __ASM_MC146818_TIME_H */

diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c
index 8bd5cf820eed9978b06fc65f15f91dda9748a7fc..d75c8875a643f771f73de0f0456bb3fc1bc50c7a 100644 (file)
--- a/arch/mips/lasat/ds1603.c
+++ b/arch/mips/lasat/ds1603.c
@@ -136,7 +136,7 @@ static void rtc_end_op(void)
        lasat_ndelay(1000);
 }
 
-void read_persistent_clock(struct timespec *ts)
+void read_persistent_clock64(struct timespec64 *ts)
 {
        unsigned long word;
        unsigned long flags;

diff --git a/arch/mips/loongson64/common/time.c b/arch/mips/loongson64/common/time.c
index e1a5382ad47e9663d4ea23e0609e01103389df2c..0ba53c55ff33ed01fac3c198220f17fff3c4d212 100644 (file)
--- a/arch/mips/loongson64/common/time.c
+++ b/arch/mips/loongson64/common/time.c
@@ -29,7 +29,7 @@ void __init plat_time_init(void)
 #endif
 }
 
-void read_persistent_clock(struct timespec *ts)
+void read_persistent_clock64(struct timespec64 *ts)
 {
        ts->tv_sec = mc146818_get_cmos_time();
        ts->tv_nsec = 0;

diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index 66c866740ff227ed788a4d41f4322aeb5198dd9b..d22b7edc3886ba276e0c87187ddb3e6255bd25da 100644 (file)
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -134,7 +134,7 @@ static void __init estimate_frequencies(void)
        }
 }
 
-void read_persistent_clock(struct timespec *ts)
+void read_persistent_clock64(struct timespec64 *ts)
 {
        ts->tv_sec = mc146818_get_cmos_time();
        ts->tv_nsec = 0;

diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c
index e62466445f0834858447d1583297e9928807ec1f..aa27a2226472a13f206a449469f7aca41a9581b9 100644 (file)
--- 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)

diff --git a/arch/mips/sibyte/swarm/rtc_xicor1241.c b/arch/mips/sibyte/swarm/rtc_xicor1241.c
index 50a82c495427e863eaddfa09d48a9774fc2b1875..a2121c1345a9fa7f407e2685eb39579ac70ed9bc 100644 (file)
--- a/arch/mips/sibyte/swarm/rtc_xicor1241.c
+++ b/arch/mips/sibyte/swarm/rtc_xicor1241.c
@@ -168,7 +168,7 @@ int xicor_set_time(unsigned long t)
        return 0;
 }
 
-unsigned long xicor_get_time(void)
+time64_t xicor_get_time(void)
 {
        unsigned int year, mon, day, hour, min, sec, y2k;
        unsigned long flags;
@@ -201,7 +201,7 @@ unsigned long xicor_get_time(void)
 
        year += (y2k * 100);
 
-       return mktime(year, mon, day, hour, min, sec);
+       return mktime64(year, mon, day, hour, min, sec);
 }
 
 int xicor_probe(void)

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index 494fb0a475acd41a202cb71f711764abd71c7ad2..7073940c02bffedaf55cd2bdb4987e7657d60cdb 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -58,11 +58,11 @@ extern void sb1250_setup(void);
 
 extern int xicor_probe(void);
 extern int xicor_set_time(unsigned long);
-extern unsigned long xicor_get_time(void);
+extern time64_t xicor_get_time(void);
 
 extern int m41t81_probe(void);
 extern int m41t81_set_time(unsigned long);
-extern unsigned long m41t81_get_time(void);
+extern time64_t m41t81_get_time(void);
 
 const char *get_system_type(void)
 {
@@ -87,9 +87,9 @@ enum swarm_rtc_type {
 
 enum swarm_rtc_type swarm_rtc_type;
 
-void read_persistent_clock(struct timespec *ts)
+void read_persistent_clock64(struct timespec64 *ts)
 {
-       unsigned long sec;
+       time64_t sec;
 
        switch (swarm_rtc_type) {
        case RTC_XICOR:
@@ -102,7 +102,7 @@ void read_persistent_clock(struct timespec *ts)
 
        case RTC_NONE:
        default:
-               sec = mktime(2000, 1, 1, 0, 0, 0);
+               sec = mktime64(2000, 1, 1, 0, 0, 0);
                break;
        }
        ts->tv_sec = sec;