diff options
| author | Torben Hohn <torbenh@gmx.de> | 2011-01-27 16:00:01 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 14:55:45 +0100 |
| commit | 7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e (patch) | |
| tree | 0e152bc67a21009f9ff8260c5c117a2061b72494 /arch/m32r | |
| parent | 1aabd67d2e97e6affdf5a7c65f442ac91ace3f85 (diff) | |
| download | linux-stable-7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e.tar.gz linux-stable-7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e.tar.bz2 linux-stable-7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e.zip | |
m32r: Switch from do_timer() to xtime_update()
xtime_update() does proper locking.
Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127150001.23248.68620.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/kernel/time.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index bda86820bffd..84dd04048db9 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c @@ -107,15 +107,14 @@ u32 arch_gettimeoffset(void) /* * timer_interrupt() needs to keep up the real-time clock, - * as well as call the "do_timer()" routine every clocktick + * as well as call the "xtime_update()" routine every clocktick */ static irqreturn_t timer_interrupt(int irq, void *dev_id) { #ifndef CONFIG_SMP profile_tick(CPU_PROFILING); #endif - /* XXX FIXME. Uh, the xtime_lock should be held here, no? */ - do_timer(1); + xtime_update(1); #ifndef CONFIG_SMP update_process_times(user_mode(get_irq_regs())); |