diff options
Diffstat (limited to 'arch/mips/sgi-ip22')
-rw-r--r-- | arch/mips/sgi-ip22/ip22-reset.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip22/ip22-time.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c index 7a941ecff3bb..66df5ac8f089 100644 --- a/arch/mips/sgi-ip22/ip22-reset.c +++ b/arch/mips/sgi-ip22/ip22-reset.c | |||
@@ -169,7 +169,7 @@ static inline void volume_down_button(unsigned long data) | |||
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | static irqreturn_t panel_int(int irq, void *dev_id, struct pt_regs *regs) | 172 | static irqreturn_t panel_int(int irq, void *dev_id) |
173 | { | 173 | { |
174 | unsigned int buttons; | 174 | unsigned int buttons; |
175 | 175 | ||
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c index 0e061890f797..3462b0d98def 100644 --- a/arch/mips/sgi-ip22/ip22-time.c +++ b/arch/mips/sgi-ip22/ip22-time.c | |||
@@ -191,12 +191,14 @@ void indy_8254timer_irq(struct pt_regs *regs) | |||
191 | 191 | ||
192 | void indy_r4k_timer_interrupt(struct pt_regs *regs) | 192 | void indy_r4k_timer_interrupt(struct pt_regs *regs) |
193 | { | 193 | { |
194 | struct pt_regs *old_regs = set_irq_regs(regs); | ||
194 | int irq = SGI_TIMER_IRQ; | 195 | int irq = SGI_TIMER_IRQ; |
195 | 196 | ||
196 | irq_enter(); | 197 | irq_enter(); |
197 | kstat_this_cpu.irqs[irq]++; | 198 | kstat_this_cpu.irqs[irq]++; |
198 | timer_interrupt(irq, NULL, regs); | 199 | timer_interrupt(irq, NULL); |
199 | irq_exit(); | 200 | irq_exit(); |
201 | set_irq_regs(old_regs); | ||
200 | } | 202 | } |
201 | 203 | ||
202 | void __init plat_timer_setup(struct irqaction *irq) | 204 | void __init plat_timer_setup(struct irqaction *irq) |