diff options
| author | Torben Hohn <torbenh@gmx.de> | 2011-01-27 15:59:21 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 14:55:43 +0100 |
| commit | 6906e33cc555c390cd091f6f363b783322dfedf6 (patch) | |
| tree | 30c46d66fc37bc08a766c15912f9d9a25ff83b59 | |
| parent | 1340f3e0b29b745a33f431455c3a37f48197bc81 (diff) | |
| download | blackbird-op-linux-6906e33cc555c390cd091f6f363b783322dfedf6.tar.gz blackbird-op-linux-6906e33cc555c390cd091f6f363b783322dfedf6.zip | |
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.c | 4 |
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) { profile_tick(CPU_PROFILING); do_leds(); - write_seqlock(&xtime_lock); - do_timer(1); - write_sequnlock(&xtime_lock); + xtime_update(1); #ifndef CONFIG_SMP update_process_times(user_mode(get_irq_regs())); #endif |
