Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MIPS: Convert read_persistent_clock() to read_persistent_clock64()

Browse Source 
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>
This commit is contained in:
Baolin Wang 2018-05-07 17:28:27 +08:00 committed by James Hogan
parent d7c72c57b1
commit 09adad1719
No known key found for this signature in database
GPG Key ID: 35CEE4862B1023F2
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/dec/time.c
View File

@ -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;
}

4
arch/mips/include/asm/mc146818-time.h
View File

@ -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 */

2
arch/mips/lasat/ds1603.c
View File

@ -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;

2
arch/mips/loongson64/common/time.c
View File

@ -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;

2
arch/mips/mti-malta/malta-time.c
View File

@ -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;

4
arch/mips/sibyte/swarm/rtc_m41t81.c
View File

@ -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)

4
arch/mips/sibyte/swarm/rtc_xicor1241.c
View File

@ -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)

10
arch/mips/sibyte/swarm/setup.c
View File

@ -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;