diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-ixp4xx/common.c | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-ixp4xx/common.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 35dd8b3824b0..c7513f6eb50c 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -256,7 +256,7 @@ static unsigned volatile last_jiffy_time; | |||
256 | 256 | ||
257 | #define CLOCK_TICKS_PER_USEC ((CLOCK_TICK_RATE + USEC_PER_SEC/2) / USEC_PER_SEC) | 257 | #define CLOCK_TICKS_PER_USEC ((CLOCK_TICK_RATE + USEC_PER_SEC/2) / USEC_PER_SEC) |
258 | 258 | ||
259 | static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 259 | static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id) |
260 | { | 260 | { |
261 | write_seqlock(&xtime_lock); | 261 | write_seqlock(&xtime_lock); |
262 | 262 | ||
@@ -267,7 +267,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs | |||
267 | * Catch up with the real idea of time | 267 | * Catch up with the real idea of time |
268 | */ | 268 | */ |
269 | while ((signed long)(*IXP4XX_OSTS - last_jiffy_time) >= LATCH) { | 269 | while ((signed long)(*IXP4XX_OSTS - last_jiffy_time) >= LATCH) { |
270 | timer_tick(regs); | 270 | timer_tick(); |
271 | last_jiffy_time += LATCH; | 271 | last_jiffy_time += LATCH; |
272 | } | 272 | } |
273 | 273 | ||