aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorben Hohn <torbenh@gmx.de>2011-01-27 09:59:21 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-01-31 08:55:43 -0500
commit6906e33cc555c390cd091f6f363b783322dfedf6 (patch)
tree30c46d66fc37bc08a766c15912f9d9a25ff83b59
parent1340f3e0b29b745a33f431455c3a37f48197bc81 (diff)
arm: Switch from do_timer() to xtime_update()
xtime_update takes the xtime_lock itself. Signed-off-by: Torben Hohn <torbenh@gmx.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Peter Zijlstra <peterz@infradead.org> Cc: johnstul@us.ibm.com Cc: hch@infradead.org Cc: yong.zhang0@gmail.com LKML-Reference: <20110127145920.23248.75541.stgit@localhost> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/arm/kernel/time.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 3d76bf233734..1ff46cabc7ef 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -107,9 +107,7 @@ void timer_tick(void)
107{ 107{
108 profile_tick(CPU_PROFILING); 108 profile_tick(CPU_PROFILING);
109 do_leds(); 109 do_leds();
110 write_seqlock(&xtime_lock); 110 xtime_update(1);
111 do_timer(1);
112 write_sequnlock(&xtime_lock);
113#ifndef CONFIG_SMP 111#ifndef CONFIG_SMP
114 update_process_times(user_mode(get_irq_regs())); 112 update_process_times(user_mode(get_irq_regs()));
115#endif 113#endif