From 2c378ef23212b00fba94217f1286a0d27960a68c Mon Sep 17 00:00:00 2001
From: Torben Hohn <torbenh@gmx.de>
Date: Thu, 27 Jan 2011 16:00:01 +0100
Subject: [PATCH] --- yaml --- r: 234582 b: refs/heads/master c:
 7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/m32r/kernel/time.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 10f61b713ba8..1de73f367067 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aabd67d2e97e6affdf5a7c65f442ac91ace3f85
+refs/heads/master: 7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e
diff --git a/trunk/arch/m32r/kernel/time.c b/trunk/arch/m32r/kernel/time.c
index bda86820bffd..84dd04048db9 100644
--- a/trunk/arch/m32r/kernel/time.c
+++ b/trunk/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()));