summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/kernel
diff options
context:
space:
mode:
authorPhilippe De Muyter <phdm@macqel.be>2010-08-06 17:47:13 +0200
committerGreg Ungerer <gerg@uclinux.org>2010-10-21 10:17:29 +1000
commit47422259b44e53e670b4ee375ff98f0603e6dd45 (patch)
tree00739e3461111687dcb48d1a64fa10ce0e09ba26 /arch/m68knommu/kernel
parent713e919e09492342eb8cd56f5aa7e3b33f672968 (diff)
downloadlinux-47422259b44e53e670b4ee375ff98f0603e6dd45.tar.bz2
m68knommu: fix default starting date
Currently m68knommu boards without RTC chip start with an unexpected default date of 1999-11-30 (Actually the source asks for 2000-00-00) Make that 1970-01-01 instead, as expected. Signed-off-by: Philippe De Muyter <phdm@macqel.be> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu/kernel')
-rw-r--r--arch/m68knommu/kernel/time.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index a90acf5b0cde..810649341e3e 100644
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -61,13 +61,16 @@ static unsigned long read_rtc_mmss(void)
{
unsigned int year, mon, day, hour, min, sec;
- if (mach_gettod)
+ if (mach_gettod) {
mach_gettod(&year, &mon, &day, &hour, &min, &sec);
- else
- year = mon = day = hour = min = sec = 0;
+ if ((year += 1900) < 1970)
+ year += 100;
+ } else {
+ year = 1970;
+ mon = day = 1;
+ hour = min = sec = 0;
+ }
- if ((year += 1900) < 1970)
- year += 100;
return mktime(year, mon, day, hour, min, sec);
}