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>

diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index bda86820bffdc19e078c5e23aeccc48c5e9581d2..84dd04048db9dc182e8b7ebab31eb44894c3726d 100644 (file)
--- 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()));