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-omap1/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/mach-omap1/time.c')
-rw-r--r-- | arch/arm/mach-omap1/time.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 4d91b9f51084..1b7e4a506c26 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c | |||
@@ -160,8 +160,7 @@ static unsigned long omap_mpu_timer_gettimeoffset(void) | |||
160 | * Latency during the interrupt is calculated using timer1. | 160 | * Latency during the interrupt is calculated using timer1. |
161 | * Both timer0 and timer1 are counting at 6MHz (P2 6.5MHz). | 161 | * Both timer0 and timer1 are counting at 6MHz (P2 6.5MHz). |
162 | */ | 162 | */ |
163 | static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id, | 163 | static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id) |
164 | struct pt_regs *regs) | ||
165 | { | 164 | { |
166 | unsigned long now, latency; | 165 | unsigned long now, latency; |
167 | 166 | ||
@@ -169,7 +168,7 @@ static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id, | |||
169 | now = 0 - omap_mpu_timer_read(0); | 168 | now = 0 - omap_mpu_timer_read(0); |
170 | latency = MPU_TICKS_PER_SEC / HZ - omap_mpu_timer_read(1); | 169 | latency = MPU_TICKS_PER_SEC / HZ - omap_mpu_timer_read(1); |
171 | omap_mpu_timer_last = now - latency; | 170 | omap_mpu_timer_last = now - latency; |
172 | timer_tick(regs); | 171 | timer_tick(); |
173 | write_sequnlock(&xtime_lock); | 172 | write_sequnlock(&xtime_lock); |
174 | 173 | ||
175 | return IRQ_HANDLED; | 174 | return IRQ_HANDLED; |
@@ -182,8 +181,7 @@ static struct irqaction omap_mpu_timer_irq = { | |||
182 | }; | 181 | }; |
183 | 182 | ||
184 | static unsigned long omap_mpu_timer1_overflows; | 183 | static unsigned long omap_mpu_timer1_overflows; |
185 | static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id, | 184 | static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id) |
186 | struct pt_regs *regs) | ||
187 | { | 185 | { |
188 | omap_mpu_timer1_overflows++; | 186 | omap_mpu_timer1_overflows++; |
189 | return IRQ_HANDLED; | 187 | return IRQ_HANDLED; |