Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 09adad17 authored by Baolin Wang's avatar Baolin Wang Committed by James Hogan
Browse files

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: default avatarBaolin Wang <baolin.wang@linaro.org>
Acked-by: default avatarArnd 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: default avatarJames Hogan <jhogan@kernel.org>
parent d7c72c57

arch/mips/dec/time.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

arch/mips/include/asm/mc146818-time.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/mips/lasat/ds1603.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/mips/loongson64/common/time.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/mips/mti-malta/malta-time.c

+1 −1
Original line number Diff line number Diff line
@@ -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;