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-pnx4008/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-pnx4008/time.c')
-rw-r--r-- | arch/arm/mach-pnx4008/time.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c index b986065cd0f3..8621c206ac84 100644 --- a/arch/arm/mach-pnx4008/time.c +++ b/arch/arm/mach-pnx4008/time.c | |||
@@ -47,15 +47,14 @@ static unsigned long pnx4008_gettimeoffset(void) | |||
47 | /*! | 47 | /*! |
48 | * IRQ handler for the timer | 48 | * IRQ handler for the timer |
49 | */ | 49 | */ |
50 | static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id, | 50 | static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id) |
51 | struct pt_regs *regs) | ||
52 | { | 51 | { |
53 | if (__raw_readl(HSTIM_INT) & MATCH0_INT) { | 52 | if (__raw_readl(HSTIM_INT) & MATCH0_INT) { |
54 | 53 | ||
55 | write_seqlock(&xtime_lock); | 54 | write_seqlock(&xtime_lock); |
56 | 55 | ||
57 | do { | 56 | do { |
58 | timer_tick(regs); | 57 | timer_tick(); |
59 | 58 | ||
60 | /* | 59 | /* |
61 | * this algorithm takes care of possible delay | 60 | * this algorithm takes care of possible delay |