Skip to content

Commit

Permalink
cris: arch-v10: Switch do_timer() to xtime_update()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Torben Hohn authored and Thomas Gleixner committed Jan 31, 2011
1 parent 4196b89 commit 17588b9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/cris/arch-v10/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 17588b9

Please sign in to comment.