Commit 17588b99 authored Jan 27, 2011 by Torben Hohn Committed by Thomas Gleixner Jan 31, 2011

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



This code failed to take the xtime_lock, which must be held when
calling do_timer(). Use the safe version xtime_update()

Signed-off-by: Torben 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: <20110127145936.23248.16192.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 4196b892

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ stop_watchdog(void)

		/*
		* 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 unsigned short myjiff; /* used by our debug routine print_timestamp */
		@@ -176,7 +176,7 @@ timer_interrupt(int irq, void *dev_id)

		/* call the real timer interrupt handler */

		do_timer(1);
		xtime_update(1);

		cris_do_profile(regs); /* Save profiling information */
		return IRQ_HANDLED;