diff options
author | Torben Hohn <torbenh@gmx.de> | 2011-01-27 09:59:26 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 08:55:44 -0500 |
commit | ec2dff2febf19ff2109c2eb3e56d5a969fe399e2 (patch) | |
tree | f7b320e4d94496a52e7ae022e361fe4236104739 /arch/arm | |
parent | 6906e33cc555c390cd091f6f363b783322dfedf6 (diff) |
arm/mach-clps711x: Switch do_timer() to xtime_update()
do_timer() requires holding the xtime_lock, which this
code did not do. Use the safe version xtime_update()
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: <20110127145926.23248.56369.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/time.h b/arch/arm/mach-clps711x/include/mach/time.h index 8fe283ccd1f3..61fef9129c6a 100644 --- a/arch/arm/mach-clps711x/include/mach/time.h +++ b/arch/arm/mach-clps711x/include/mach/time.h | |||
@@ -30,7 +30,7 @@ p720t_timer_interrupt(int irq, void *dev_id) | |||
30 | { | 30 | { |
31 | struct pt_regs *regs = get_irq_regs(); | 31 | struct pt_regs *regs = get_irq_regs(); |
32 | do_leds(); | 32 | do_leds(); |
33 | do_timer(1); | 33 | xtime_update(1); |
34 | #ifndef CONFIG_SMP | 34 | #ifndef CONFIG_SMP |
35 | update_process_times(user_mode(regs)); | 35 | update_process_times(user_mode(regs)); |
36 | #endif | 36 | #endif |