[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110127145941.23248.92547.stgit@localhost>
Date: Thu, 27 Jan 2011 15:59:41 +0100
From: Torben Hohn <torbenh@....de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: hch@...radead.org, Jesper Nilsson <jesper.nilsson@...s.com>,
Peter Zijlstra <peterz@...radead.org>, johnstul@...ibm.com,
Mikael Starvik <starvik@...s.com>, yong.zhang0@...il.com,
Thomas Gleixner <tglx@...utronix.de>
Subject: [PATCH v2 10/20] cris/arch-v32: switch do_timer() to xtime_update()
xtime_update() takes the xtime_lock itself.
Cc: Mikael Starvik <starvik@...s.com>
Cc: Jesper Nilsson <jesper.nilsson@...s.com>
Signed-off-by: Torben Hohn <torbenh@....de>
---
arch/cris/arch-v32/kernel/time.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
index a545211..bb978ed 100644
--- a/arch/cris/arch-v32/kernel/time.c
+++ b/arch/cris/arch-v32/kernel/time.c
@@ -183,7 +183,7 @@ void handle_watchdog_bite(struct pt_regs *regs)
/*
* 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.
*/
extern void cris_do_profile(struct pt_regs *regs);
@@ -216,9 +216,7 @@ static inline irqreturn_t timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
/* Call the real timer interrupt handler */
- write_seqlock(&xtime_lock);
- do_timer(1);
- write_sequnlock(&xtime_lock);
+ xtime_update(1);
return IRQ_HANDLED;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists