diff options
Diffstat (limited to 'arch/mips/gt64120/common/time.c')
-rw-r--r-- | arch/mips/gt64120/common/time.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c index 7feca49350d1..c83ae6acd601 100644 --- a/arch/mips/gt64120/common/time.c +++ b/arch/mips/gt64120/common/time.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
12 | #include <linux/kernel_stat.h> | 12 | #include <linux/kernel_stat.h> |
13 | #include <asm/ptrace.h> | 13 | #include <asm/irq_regs.h> |
14 | #include <asm/gt64120.h> | 14 | #include <asm/gt64120.h> |
15 | 15 | ||
16 | /* | 16 | /* |
@@ -19,7 +19,7 @@ | |||
19 | * differently than other MIPS interrupts. | 19 | * differently than other MIPS interrupts. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | static void gt64120_irq(int irq, void *dev_id, struct pt_regs *regs) | 22 | static irqreturn_t gt64120_irq(int irq, void *dev_id) |
23 | { | 23 | { |
24 | unsigned int irq_src, int_high_src, irq_src_mask, int_high_src_mask; | 24 | unsigned int irq_src, int_high_src, irq_src_mask, int_high_src_mask; |
25 | int handled = 0; | 25 | int handled = 0; |
@@ -36,12 +36,14 @@ static void gt64120_irq(int irq, void *dev_id, struct pt_regs *regs) | |||
36 | irq_src &= ~0x00000800; | 36 | irq_src &= ~0x00000800; |
37 | do_timer(1); | 37 | do_timer(1); |
38 | #ifndef CONFIG_SMP | 38 | #ifndef CONFIG_SMP |
39 | update_process_times(user_mode(regs)); | 39 | update_process_times(user_mode(get_irq_regs())); |
40 | #endif | 40 | #endif |
41 | } | 41 | } |
42 | 42 | ||
43 | GT_WRITE(GT_INTRCAUSE_OFS, 0); | 43 | GT_WRITE(GT_INTRCAUSE_OFS, 0); |
44 | GT_WRITE(GT_HINTRCAUSE_OFS, 0); | 44 | GT_WRITE(GT_HINTRCAUSE_OFS, 0); |
45 | |||
46 | return IRQ_HANDLED; | ||
45 | } | 47 | } |
46 | 48 | ||
47 | /* | 49 | /* |