[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-1340f3e0b29b745a33f431455c3a37f48197bc81@git.kernel.org>
Date: Mon, 31 Jan 2011 14:05:55 GMT
From: tip-bot for Torben Hohn <torbenh@....de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
peterz@...radead.org, torbenh@....de, mattst88@...il.com,
ink@...assic.park.msu.ru, tglx@...utronix.de, rth@...ddle.net
Subject: [tip:timers/core] alpha: Change do_timer() to xtime_update()
Commit-ID: 1340f3e0b29b745a33f431455c3a37f48197bc81
Gitweb: http://git.kernel.org/tip/1340f3e0b29b745a33f431455c3a37f48197bc81
Author: Torben Hohn <torbenh@....de>
AuthorDate: Thu, 27 Jan 2011 15:59:15 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 31 Jan 2011 14:55:43 +0100
alpha: Change do_timer() to xtime_update()
xtime_update() takes the xtime_lock itself.
timer_interrupt() is only called on the boot cpu. See do_entInt(). So
"state" in timer_interrupt does not require protection by xtime_lock.
Signed-off-by: Torben Hohn <torbenh@....de>
Cc: Richard Henderson <rth@...ddle.net>
Cc: Ivan Kokshaysky <ink@...assic.park.msu.ru>
Cc: Matt Turner <mattst88@...il.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: johnstul@...ibm.com
Cc: hch@...radead.org
Cc: yong.zhang0@...il.com
LKML-Reference: <20110127145915.23248.20919.stgit@...alhost>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/alpha/kernel/time.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index c1f3e7c..a58e84f 100644
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -159,7 +159,7 @@ void read_persistent_clock(struct timespec *ts)
/*
* 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
*/
irqreturn_t timer_interrupt(int irq, void *dev)
{
@@ -172,8 +172,6 @@ irqreturn_t timer_interrupt(int irq, void *dev)
profile_tick(CPU_PROFILING);
#endif
- write_seqlock(&xtime_lock);
-
/*
* Calculate how many ticks have passed since the last update,
* including any previous partial leftover. Save any resulting
@@ -187,9 +185,7 @@ irqreturn_t timer_interrupt(int irq, void *dev)
nticks = delta >> FIX_SHIFT;
if (nticks)
- do_timer(nticks);
-
- write_sequnlock(&xtime_lock);
+ xtime_update(nticks);
if (test_irq_work_pending()) {
clear_irq_work_pending();
--
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