git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
time.c
diff --git
a/arch/m68knommu/kernel/time.c
b/arch/m68knommu/kernel/time.c
index
7089dd9
..
d6ac2a4
100644
(file)
--- a/
arch/m68knommu/kernel/time.c
+++ b/
arch/m68knommu/kernel/time.c
@@
-60,13
+60,16
@@
static unsigned long read_rtc_mmss(void)
{
unsigned int year, mon, day, hour, min, sec;
{
unsigned int year, mon, day, hour, min, sec;
- if (mach_gettod)
+ if (mach_gettod)
{
mach_gettod(&year, &mon, &day, &hour, &min, &sec);
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);
}
return mktime(year, mon, day, hour, min, sec);
}