diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:10:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:10:06 -0400 |
commit | 7d02093e29de9efc4a72d5e93baae9506969b789 (patch) | |
tree | a6fc2450132ae419934f6eb9d223baa338b7d782 /arch/m68k/kernel | |
parent | 6e0b7b2c39b91b467270dd0bc383914f99e1fb28 (diff) | |
parent | e9ddbc075d95b2edf111247cdde16f33c31654a8 (diff) |
Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
avr32: Fix typo in read_persistent_clock()
sparc: Convert sparc to use read/update_persistent_clock
cris: Convert cris to use read/update_persistent_clock
m68k: Convert m68k to use read/update_persistent_clock
m32r: Convert m32r to use read/update_peristent_clock
blackfin: Convert blackfin to use read/update_persistent_clock
ia64: Convert ia64 to use read/update_persistent_clock
avr32: Convert avr32 to use read/update_persistent_clock
h8300: Convert h8300 to use read/update_persistent_clock
frv: Convert frv to use read/update_persistent_clock
mn10300: Convert mn10300 to use read/update_persistent_clock
alpha: Convert alpha to use read/update_persistent_clock
xtensa: Fix unnecessary setting of xtime
time: Clean up direct xtime usage in xen
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/time.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 17dc2a31a7ca..4926b3856c15 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c | |||
@@ -73,21 +73,24 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) | |||
73 | return IRQ_HANDLED; | 73 | return IRQ_HANDLED; |
74 | } | 74 | } |
75 | 75 | ||
76 | void __init time_init(void) | 76 | void read_persistent_clock(struct timespec *ts) |
77 | { | 77 | { |
78 | struct rtc_time time; | 78 | struct rtc_time time; |
79 | ts->tv_sec = 0; | ||
80 | ts->tv_nsec = 0; | ||
79 | 81 | ||
80 | if (mach_hwclk) { | 82 | if (mach_hwclk) { |
81 | mach_hwclk(0, &time); | 83 | mach_hwclk(0, &time); |
82 | 84 | ||
83 | if ((time.tm_year += 1900) < 1970) | 85 | if ((time.tm_year += 1900) < 1970) |
84 | time.tm_year += 100; | 86 | time.tm_year += 100; |
85 | xtime.tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday, | 87 | ts->tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday, |
86 | time.tm_hour, time.tm_min, time.tm_sec); | 88 | time.tm_hour, time.tm_min, time.tm_sec); |
87 | xtime.tv_nsec = 0; | ||
88 | } | 89 | } |
89 | wall_to_monotonic.tv_sec = -xtime.tv_sec; | 90 | } |
90 | 91 | ||
92 | void __init time_init(void) | ||
93 | { | ||
91 | mach_sched_init(timer_interrupt); | 94 | mach_sched_init(timer_interrupt); |
92 | } | 95 | } |
93 | 96 | ||