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-realview | |
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-realview')
-rw-r--r-- | arch/arm/mach-realview/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index da0286973823..68c67053f479 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -515,18 +515,18 @@ static unsigned long realview_gettimeoffset(void) | |||
515 | /* | 515 | /* |
516 | * IRQ handler for the timer | 516 | * IRQ handler for the timer |
517 | */ | 517 | */ |
518 | static irqreturn_t realview_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 518 | static irqreturn_t realview_timer_interrupt(int irq, void *dev_id) |
519 | { | 519 | { |
520 | write_seqlock(&xtime_lock); | 520 | write_seqlock(&xtime_lock); |
521 | 521 | ||
522 | // ...clear the interrupt | 522 | // ...clear the interrupt |
523 | writel(1, TIMER0_VA_BASE + TIMER_INTCLR); | 523 | writel(1, TIMER0_VA_BASE + TIMER_INTCLR); |
524 | 524 | ||
525 | timer_tick(regs); | 525 | timer_tick(); |
526 | 526 | ||
527 | #if defined(CONFIG_SMP) && !defined(CONFIG_LOCAL_TIMERS) | 527 | #if defined(CONFIG_SMP) && !defined(CONFIG_LOCAL_TIMERS) |
528 | smp_send_timer(); | 528 | smp_send_timer(); |
529 | update_process_times(user_mode(regs)); | 529 | update_process_times(user_mode(get_irq_regs())); |
530 | #endif | 530 | #endif |
531 | 531 | ||
532 | write_sequnlock(&xtime_lock); | 532 | write_sequnlock(&xtime_lock); |