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/mn10300/kernel/time.c | |
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/mn10300/kernel/time.c')
-rw-r--r-- | arch/mn10300/kernel/time.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mn10300/kernel/time.c b/arch/mn10300/kernel/time.c index 395caf01b909..8f7f6d22783d 100644 --- a/arch/mn10300/kernel/time.c +++ b/arch/mn10300/kernel/time.c | |||
@@ -111,7 +111,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
111 | /* advance the kernel's time tracking system */ | 111 | /* advance the kernel's time tracking system */ |
112 | profile_tick(CPU_PROFILING); | 112 | profile_tick(CPU_PROFILING); |
113 | do_timer(1); | 113 | do_timer(1); |
114 | check_rtc_time(); | ||
115 | } | 114 | } |
116 | 115 | ||
117 | write_sequnlock(&xtime_lock); | 116 | write_sequnlock(&xtime_lock); |
@@ -139,9 +138,6 @@ void __init time_init(void) | |||
139 | " (calibrated against RTC)\n", | 138 | " (calibrated against RTC)\n", |
140 | MN10300_TSCCLK / 1000000, (MN10300_TSCCLK / 10000) % 100); | 139 | MN10300_TSCCLK / 1000000, (MN10300_TSCCLK / 10000) % 100); |
141 | 140 | ||
142 | xtime.tv_sec = get_initial_rtc_time(); | ||
143 | xtime.tv_nsec = 0; | ||
144 | |||
145 | mn10300_last_tsc = TMTSCBC; | 141 | mn10300_last_tsc = TMTSCBC; |
146 | 142 | ||
147 | /* use timer 0 & 1 cascaded to tick at as close to HZ as possible */ | 143 | /* use timer 0 & 1 cascaded to tick at as close to HZ as possible */ |