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-integrator | |
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-integrator')
-rw-r--r-- | arch/arm/mach-integrator/core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index e9c82deb791..7fbbc17f8e8 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
@@ -250,8 +250,6 @@ unsigned long integrator_gettimeoffset(void) | |||
250 | static irqreturn_t | 250 | static irqreturn_t |
251 | integrator_timer_interrupt(int irq, void *dev_id) | 251 | integrator_timer_interrupt(int irq, void *dev_id) |
252 | { | 252 | { |
253 | write_seqlock(&xtime_lock); | ||
254 | |||
255 | /* | 253 | /* |
256 | * clear the interrupt | 254 | * clear the interrupt |
257 | */ | 255 | */ |
@@ -259,8 +257,6 @@ integrator_timer_interrupt(int irq, void *dev_id) | |||
259 | 257 | ||
260 | timer_tick(); | 258 | timer_tick(); |
261 | 259 | ||
262 | write_sequnlock(&xtime_lock); | ||
263 | |||
264 | return IRQ_HANDLED; | 260 | return IRQ_HANDLED; |
265 | } | 261 | } |
266 | 262 | ||