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/plat-iop/time.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/plat-iop/time.c')
-rw-r--r-- | arch/arm/plat-iop/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 06282dffbdc6..f530abdaa7a1 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c | |||
@@ -47,7 +47,7 @@ unsigned long iop3xx_gettimeoffset(void) | |||
47 | } | 47 | } |
48 | 48 | ||
49 | static irqreturn_t | 49 | static irqreturn_t |
50 | iop3xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 50 | iop3xx_timer_interrupt(int irq, void *dev_id) |
51 | { | 51 | { |
52 | write_seqlock(&xtime_lock); | 52 | write_seqlock(&xtime_lock); |
53 | 53 | ||
@@ -57,7 +57,7 @@ iop3xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
57 | 57 | ||
58 | while ((signed long)(next_jiffy_time - *IOP3XX_TU_TCR1) | 58 | while ((signed long)(next_jiffy_time - *IOP3XX_TU_TCR1) |
59 | >= ticks_per_jiffy) { | 59 | >= ticks_per_jiffy) { |
60 | timer_tick(regs); | 60 | timer_tick(); |
61 | next_jiffy_time -= ticks_per_jiffy; | 61 | next_jiffy_time -= ticks_per_jiffy; |
62 | } | 62 | } |
63 | 63 | ||