summaryrefslogtreecommitdiff
path: root/arch/arm/mach-clps711x
diff options
context:
space:
mode:
authorTorben Hohn <torbenh@gmx.de>2011-01-27 15:59:26 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-01-31 14:55:44 +0100
commitec2dff2febf19ff2109c2eb3e56d5a969fe399e2 (patch)
treef7b320e4d94496a52e7ae022e361fe4236104739 /arch/arm/mach-clps711x
parent6906e33cc555c390cd091f6f363b783322dfedf6 (diff)
downloadlinux-3.10-ec2dff2febf19ff2109c2eb3e56d5a969fe399e2.tar.gz
linux-3.10-ec2dff2febf19ff2109c2eb3e56d5a969fe399e2.tar.bz2
linux-3.10-ec2dff2febf19ff2109c2eb3e56d5a969fe399e2.zip
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/mach-clps711x')
-rw-r--r--arch/arm/mach-clps711x/include/mach/time.h2
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 8fe283ccd1f..61fef9129c6 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)
{
struct pt_regs *regs = get_irq_regs();
do_leds();
- do_timer(1);
+ xtime_update(1);
#ifndef CONFIG_SMP
update_process_times(user_mode(regs));
#endif