m68knommu: fix default starting date
authorPhilippe De Muyter <phdm@macqel.be>
Fri, 6 Aug 2010 15:47:13 +0000 (17:47 +0200)
committerGreg Ungerer <gerg@uclinux.org>
Thu, 21 Oct 2010 00:17:29 +0000 (10:17 +1000)
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>
arch/m68knommu/kernel/time.c

index a90acf5..8106493 100644 (file)
@@ -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);
 }