diff options
Diffstat (limited to 'arch/mips/mips-boards/sim/sim_time.c')
-rw-r--r-- | arch/mips/mips-boards/sim/sim_time.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c index 230929ecd57f..acd83a379559 100644 --- a/arch/mips/mips-boards/sim/sim_time.c +++ b/arch/mips/mips-boards/sim/sim_time.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | unsigned long cpu_khz; | 34 | unsigned long cpu_khz; |
35 | 35 | ||
36 | irqreturn_t sim_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 36 | irqreturn_t sim_timer_interrupt(int irq, void *dev_id) |
37 | { | 37 | { |
38 | #ifdef CONFIG_SMP | 38 | #ifdef CONFIG_SMP |
39 | int cpu = smp_processor_id(); | 39 | int cpu = smp_processor_id(); |
@@ -44,7 +44,7 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
44 | */ | 44 | */ |
45 | #ifndef CONFIG_MIPS_MT_SMTC | 45 | #ifndef CONFIG_MIPS_MT_SMTC |
46 | if (cpu == 0) { | 46 | if (cpu == 0) { |
47 | timer_interrupt(irq, dev_id, regs); | 47 | timer_interrupt(irq, dev_id); |
48 | } | 48 | } |
49 | else { | 49 | else { |
50 | /* Everyone else needs to reset the timer int here as | 50 | /* Everyone else needs to reset the timer int here as |
@@ -84,7 +84,7 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
84 | irq_enable_hazard(); | 84 | irq_enable_hazard(); |
85 | evpe(vpflags); | 85 | evpe(vpflags); |
86 | 86 | ||
87 | if(cpu_data[cpu].vpe_id == 0) timer_interrupt(irq, dev_id, regs); | 87 | if(cpu_data[cpu].vpe_id == 0) timer_interrupt(irq, dev_id); |
88 | else write_c0_compare (read_c0_count() + ( mips_hpt_frequency/HZ)); | 88 | else write_c0_compare (read_c0_count() + ( mips_hpt_frequency/HZ)); |
89 | smtc_timer_broadcast(cpu_data[cpu].vpe_id); | 89 | smtc_timer_broadcast(cpu_data[cpu].vpe_id); |
90 | 90 | ||
@@ -93,10 +93,10 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
93 | /* | 93 | /* |
94 | * every CPU should do profiling and process accounting | 94 | * every CPU should do profiling and process accounting |
95 | */ | 95 | */ |
96 | local_timer_interrupt (irq, dev_id, regs); | 96 | local_timer_interrupt (irq, dev_id); |
97 | return IRQ_HANDLED; | 97 | return IRQ_HANDLED; |
98 | #else | 98 | #else |
99 | return timer_interrupt (irq, dev_id, regs); | 99 | return timer_interrupt (irq, dev_id); |
100 | #endif | 100 | #endif |
101 | } | 101 | } |
102 | 102 | ||
@@ -177,9 +177,9 @@ void __init sim_time_init(void) | |||
177 | 177 | ||
178 | static int mips_cpu_timer_irq; | 178 | static int mips_cpu_timer_irq; |
179 | 179 | ||
180 | static void mips_timer_dispatch (struct pt_regs *regs) | 180 | static void mips_timer_dispatch(void) |
181 | { | 181 | { |
182 | do_IRQ (mips_cpu_timer_irq, regs); | 182 | do_IRQ(mips_cpu_timer_irq); |
183 | } | 183 | } |
184 | 184 | ||
185 | 185 | ||