Messages in this thread Patch in this message | | | Date | Mon, 31 Jan 2011 14:09:25 GMT | From | tip-bot for Torben Hohn <> | Subject | [tip:timers/core] m32r: Switch from do_timer() to xtime_update() |
| |
Commit-ID: 7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e Gitweb: http://git.kernel.org/tip/7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e Author: Torben Hohn <torbenh@gmx.de> AuthorDate: Thu, 27 Jan 2011 16:00:01 +0100 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Mon, 31 Jan 2011 14:55:45 +0100
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> --- 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 bda8682..84dd040 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()));
| |