From d052eecee8439964bc2ba3c8c9ca2696a6f36096 Mon Sep 17 00:00:00 2001
From: Torben Hohn <torbenh@gmx.de>
Date: Thu, 27 Jan 2011 15:59:31 +0100
Subject: [PATCH] --- yaml --- r: 234576 b: refs/heads/master c:
 4196b892d55caaf2c98da05e80472ca482ca19fe h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5bd9c6a95828..585c21cc56e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec2dff2febf19ff2109c2eb3e56d5a969fe399e2
+refs/heads/master: 4196b892d55caaf2c98da05e80472ca482ca19fe
diff --git a/trunk/arch/blackfin/kernel/time.c b/trunk/arch/blackfin/kernel/time.c
index c9113619029f..8d73724c0092 100644
--- a/trunk/arch/blackfin/kernel/time.c
+++ b/trunk/arch/blackfin/kernel/time.c
@@ -114,16 +114,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
  */
 #ifdef CONFIG_CORE_TIMER_IRQ_L1
 __attribute__((l1_text))
 #endif
 irqreturn_t timer_interrupt(int irq, void *dummy)
 {
-	write_seqlock(&xtime_lock);
-	do_timer(1);
-	write_sequnlock(&xtime_lock);
+	xtime_update(1);
 
 #ifdef CONFIG_IPIPE
 	update_root_process_times(get_irq_regs());