---

yaml
---
r: 234579
b: refs/heads/master
c: 57464bd
h: refs/heads/master
i:
  234577: 75efabb
  234575: b5f0348
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36cb07bb8118cb14211ef25c58026f005877c47d
+refs/heads/master: 57464bd87f708e75b47312766e3fc8dc3aaf66ad

trunk/arch/frv/kernel/time.c

@@ -50,30 +50,20 @@ static struct irqaction timer_irq  = {
 
 /*
  * 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 *dummy)
 {
 	profile_tick(CPU_PROFILING);
-	/*
-	 * Here we are in the timer irq handler. We just have irqs locally
-	 * disabled but we don't know if the timer_bh is running on the other
-	 * CPU. We need to avoid to SMP race with it. NOTE: we don't need
-	 * the irq version of write_lock because as just said we have irq
-	 * locally disabled. -arca
-	 */
-	write_seqlock(&xtime_lock);
 
-	do_timer(1);
+	xtime_update(1);
 
 #ifdef CONFIG_HEARTBEAT
 	static unsigned short n;
 	n++;
 	__set_LEDS(n);
 #endif /* CONFIG_HEARTBEAT */
 
-	write_sequnlock(&xtime_lock);
-
 	update_process_times(user_mode(get_irq_regs()));
 
 	return IRQ_HANDLED;