Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1340f3e0 authored by Torben Hohn's avatar Torben Hohn Committed by Thomas Gleixner
Browse files

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: default avatarTorben Hohn <torbenh@gmx.de>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127145915.23248.20919.stgit@localhost>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f0af911a

arch/alpha/kernel/time.c

+2 −6
Original line number Diff line number Diff line
@@ -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();