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-ebsa110 | |
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-ebsa110')
-rw-r--r-- | arch/arm/mach-ebsa110/core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index 8c1b5690dfe8..7710e14b5268 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c | |||
@@ -178,8 +178,6 @@ ebsa110_timer_interrupt(int irq, void *dev_id) | |||
178 | { | 178 | { |
179 | u32 count; | 179 | u32 count; |
180 | 180 | ||
181 | write_seqlock(&xtime_lock); | ||
182 | |||
183 | /* latch and read timer 1 */ | 181 | /* latch and read timer 1 */ |
184 | __raw_writeb(0x40, PIT_CTRL); | 182 | __raw_writeb(0x40, PIT_CTRL); |
185 | count = __raw_readb(PIT_T1); | 183 | count = __raw_readb(PIT_T1); |
@@ -192,8 +190,6 @@ ebsa110_timer_interrupt(int irq, void *dev_id) | |||
192 | 190 | ||
193 | timer_tick(); | 191 | timer_tick(); |
194 | 192 | ||
195 | write_sequnlock(&xtime_lock); | ||
196 | |||
197 | return IRQ_HANDLED; | 193 | return IRQ_HANDLED; |
198 | } | 194 | } |
199 | 195 | ||