diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-01-28 05:16:37 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 05:17:12 -0500 |
commit | 193c3cc12583344be01206078d9ad3fec5dbc397 (patch) | |
tree | 97eb5d6ec88969d21fbf0c5815e3b77e8e1f4aaf /arch/arm/mach-clps7500 | |
parent | 6232be32afa121628c72291ce7eaa24a639905c2 (diff) |
[ARM] Fix timer damage from d3d74453c34f8fd87674a8cf5b8a327c68f22e99
Move the xtime write mode seqlock into timer_tick(), so it only
surrounds the call to do_timer().
This avoids a deadlock in update_process_times() ...
hrtimer_get_softirq_time() which tries to get a read mode seqlock
on xtime, thereby preventing booting.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-clps7500')
-rw-r--r-- | arch/arm/mach-clps7500/core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c index 986205ec9269..2ac63671ea5f 100644 --- a/arch/arm/mach-clps7500/core.c +++ b/arch/arm/mach-clps7500/core.c | |||
@@ -298,8 +298,6 @@ extern unsigned long ioc_timer_gettimeoffset(void); | |||
298 | static irqreturn_t | 298 | static irqreturn_t |
299 | clps7500_timer_interrupt(int irq, void *dev_id) | 299 | clps7500_timer_interrupt(int irq, void *dev_id) |
300 | { | 300 | { |
301 | write_seqlock(&xtime_lock); | ||
302 | |||
303 | timer_tick(); | 301 | timer_tick(); |
304 | 302 | ||
305 | /* Why not using do_leds interface?? */ | 303 | /* Why not using do_leds interface?? */ |
@@ -313,8 +311,6 @@ clps7500_timer_interrupt(int irq, void *dev_id) | |||
313 | } | 311 | } |
314 | } | 312 | } |
315 | 313 | ||
316 | write_sequnlock(&xtime_lock); | ||
317 | |||
318 | return IRQ_HANDLED; | 314 | return IRQ_HANDLED; |
319 | } | 315 | } |
320 | 316 | ||