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

Commit 7bde2ab7 authored by Torben Hohn's avatar Torben Hohn Committed by Thomas Gleixner
Browse files

m32r: Switch from do_timer() to xtime_update() 



xtime_update() does proper locking.

Signed-off-by: default avatarTorben Hohn <torbenh@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127150001.23248.68620.stgit@localhost>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1aabd67d

arch/m32r/kernel/time.c

+2 −3
Original line number Diff line number Diff line
@@ -107,15 +107,14 @@ u32 arch_gettimeoffset(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 irqreturn_t timer_interrupt(int irq, void *dev_id)

{

#ifndef CONFIG_SMP

	profile_tick(CPU_PROFILING);

#endif

	/* XXX FIXME. Uh, the xtime_lock should be held here, no? */

	do_timer(1);

	xtime_update(1);



#ifndef CONFIG_SMP

	update_process_times(user_mode(get_irq_regs()));