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-integrator/core.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-integrator/core.c')
-rw-r--r-- | arch/arm/mach-integrator/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 42021fdfa0c6..8d880cb9ba39 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
@@ -248,7 +248,7 @@ unsigned long integrator_gettimeoffset(void) | |||
248 | * IRQ handler for the timer | 248 | * IRQ handler for the timer |
249 | */ | 249 | */ |
250 | static irqreturn_t | 250 | static irqreturn_t |
251 | integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 251 | integrator_timer_interrupt(int irq, void *dev_id) |
252 | { | 252 | { |
253 | write_seqlock(&xtime_lock); | 253 | write_seqlock(&xtime_lock); |
254 | 254 | ||
@@ -262,7 +262,7 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
262 | * primary CPU | 262 | * primary CPU |
263 | */ | 263 | */ |
264 | if (hard_smp_processor_id() == 0) { | 264 | if (hard_smp_processor_id() == 0) { |
265 | timer_tick(regs); | 265 | timer_tick(); |
266 | #ifdef CONFIG_SMP | 266 | #ifdef CONFIG_SMP |
267 | smp_send_timer(); | 267 | smp_send_timer(); |
268 | #endif | 268 | #endif |
@@ -272,7 +272,7 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
272 | /* | 272 | /* |
273 | * this is the ARM equivalent of the APIC timer interrupt | 273 | * this is the ARM equivalent of the APIC timer interrupt |
274 | */ | 274 | */ |
275 | update_process_times(user_mode(regs)); | 275 | update_process_times(user_mode(get_irq_regs())); |
276 | #endif /* CONFIG_SMP */ | 276 | #endif /* CONFIG_SMP */ |
277 | 277 | ||
278 | write_sequnlock(&xtime_lock); | 278 | write_sequnlock(&xtime_lock); |