Skip to content

Commit

Permalink
h8300: Switch do_timer() to xtime_update()
Browse files Browse the repository at this point in the history
xtime_update() takes the xtime_lock itself.

Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127145951.23248.92727.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 57464bd commit daad8b5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions arch/h8300/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ void h8300_timer_tick(void)
{
if (current->pid)
profile_tick(CPU_PROFILING);
write_seqlock(&xtime_lock);
do_timer(1);
write_sequnlock(&xtime_lock);
xtime_update(1);
update_process_times(user_mode(get_irq_regs()));
}

Expand Down
2 changes: 1 addition & 1 deletion arch/h8300/kernel/timer/timer8.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

/*
* 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 irqreturn_t timer_interrupt(int irq, void *dev_id)
Expand Down

0 comments on commit daad8b5

Please sign in to comment.