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

Commit 36cb07bb authored by Torben Hohn's avatar Torben Hohn Committed by Thomas Gleixner
Browse files

cris: arch-v32: Switch do_timer() to xtime_update() 



xtime_update() takes the xtime_lock itself.

Signed-off-by: default avatarTorben Hohn <torbenh@gmx.de>
Cc: hch@infradead.org
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: Mikael Starvik <starvik@axis.com>
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127145941.23248.92547.stgit@localhost>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 17588b99

arch/cris/arch-v32/kernel/time.c

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

}