From 552c5f1ae4750967088ffa6dc3aa22cd64ef14ab Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Thu, 27 Jan 2011 15:59:46 +0100 Subject: [PATCH] --- yaml --- r: 234579 b: refs/heads/master c: 57464bd87f708e75b47312766e3fc8dc3aaf66ad h: refs/heads/master i: 234577: 75efabb0808ab3db5b42aa87c926c1d6be6005e5 234575: b5f0348bcfc62a43dbe32c22042dd124b8447853 v: v3 --- [refs] | 2 +- trunk/arch/frv/kernel/time.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index b8078b97b0f3..91fc7d21c772 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36cb07bb8118cb14211ef25c58026f005877c47d +refs/heads/master: 57464bd87f708e75b47312766e3fc8dc3aaf66ad diff --git a/trunk/arch/frv/kernel/time.c b/trunk/arch/frv/kernel/time.c index 0ddbbae83cb2..b457de496b70 100644 --- a/trunk/arch/frv/kernel/time.c +++ b/trunk/arch/frv/kernel/time.c @@ -50,21 +50,13 @@ 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; @@ -72,8 +64,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) __set_LEDS(n); #endif /* CONFIG_HEARTBEAT */ - write_sequnlock(&xtime_lock); - update_process_times(user_mode(get_irq_regs())); return IRQ_HANDLED;