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-at91rm9200/at91rm9200_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-at91rm9200/at91rm9200_time.c')
-rw-r--r-- | arch/arm/mach-at91rm9200/at91rm9200_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91rm9200/at91rm9200_time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c index a92a8622c78a..07c9cea8961d 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200_time.c +++ b/arch/arm/mach-at91rm9200/at91rm9200_time.c | |||
@@ -65,13 +65,13 @@ static unsigned long at91rm9200_gettimeoffset(void) | |||
65 | /* | 65 | /* |
66 | * IRQ handler for the timer. | 66 | * IRQ handler for the timer. |
67 | */ | 67 | */ |
68 | static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 68 | static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id) |
69 | { | 69 | { |
70 | if (at91_sys_read(AT91_ST_SR) & AT91_ST_PITS) { /* This is a shared interrupt */ | 70 | if (at91_sys_read(AT91_ST_SR) & AT91_ST_PITS) { /* This is a shared interrupt */ |
71 | write_seqlock(&xtime_lock); | 71 | write_seqlock(&xtime_lock); |
72 | 72 | ||
73 | while (((read_CRTR() - last_crtr) & AT91_ST_ALMV) >= LATCH) { | 73 | while (((read_CRTR() - last_crtr) & AT91_ST_ALMV) >= LATCH) { |
74 | timer_tick(regs); | 74 | timer_tick(); |
75 | last_crtr = (last_crtr + LATCH) & AT91_ST_ALMV; | 75 | last_crtr = (last_crtr + LATCH) & AT91_ST_ALMV; |
76 | } | 76 | } |
77 | 77 | ||