aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mips-boards/generic/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/mips-boards/generic/time.c')
-rw-r--r--arch/mips/mips-boards/generic/time.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index 8d15861fce61..d379000162f3 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -82,19 +82,19 @@ static inline void scroll_display_message(void)
82 } 82 }
83} 83}
84 84
85static void mips_timer_dispatch (struct pt_regs *regs) 85static void mips_timer_dispatch(void)
86{ 86{
87 do_IRQ (mips_cpu_timer_irq, regs); 87 do_IRQ(mips_cpu_timer_irq);
88} 88}
89 89
90/* 90/*
91 * Redeclare until I get around mopping the timer code insanity on MIPS. 91 * Redeclare until I get around mopping the timer code insanity on MIPS.
92 */ 92 */
93extern int null_perf_irq(struct pt_regs *regs); 93extern int null_perf_irq(void);
94 94
95extern int (*perf_irq)(struct pt_regs *regs); 95extern int (*perf_irq)(void);
96 96
97irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 97irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
98{ 98{
99 int cpu = smp_processor_id(); 99 int cpu = smp_processor_id();
100 100
@@ -119,7 +119,7 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
119 * perf counter overflow, or both. 119 * perf counter overflow, or both.
120 */ 120 */
121 if (read_c0_cause() & (1 << 26)) 121 if (read_c0_cause() & (1 << 26))
122 perf_irq(regs); 122 perf_irq();
123 123
124 if (read_c0_cause() & (1 << 30)) { 124 if (read_c0_cause() & (1 << 30)) {
125 /* If timer interrupt, make it de-assert */ 125 /* If timer interrupt, make it de-assert */
@@ -139,13 +139,13 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
139 * the tick on VPE 0 to run the full timer_interrupt(). 139 * the tick on VPE 0 to run the full timer_interrupt().
140 */ 140 */
141 if (cpu_data[cpu].vpe_id == 0) { 141 if (cpu_data[cpu].vpe_id == 0) {
142 timer_interrupt(irq, NULL, regs); 142 timer_interrupt(irq, NULL);
143 smtc_timer_broadcast(cpu_data[cpu].vpe_id); 143 smtc_timer_broadcast(cpu_data[cpu].vpe_id);
144 scroll_display_message(); 144 scroll_display_message();
145 } else { 145 } else {
146 write_c0_compare(read_c0_count() + 146 write_c0_compare(read_c0_count() +
147 (mips_hpt_frequency/HZ)); 147 (mips_hpt_frequency/HZ));
148 local_timer_interrupt(irq, dev_id, regs); 148 local_timer_interrupt(irq, dev_id);
149 smtc_timer_broadcast(cpu_data[cpu].vpe_id); 149 smtc_timer_broadcast(cpu_data[cpu].vpe_id);
150 } 150 }
151 } 151 }
@@ -159,12 +159,12 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
159 * timer int. 159 * timer int.
160 */ 160 */
161 if (!r2 || (read_c0_cause() & (1 << 26))) 161 if (!r2 || (read_c0_cause() & (1 << 26)))
162 if (perf_irq(regs)) 162 if (perf_irq())
163 goto out; 163 goto out;
164 164
165 /* we keep interrupt disabled all the time */ 165 /* we keep interrupt disabled all the time */
166 if (!r2 || (read_c0_cause() & (1 << 30))) 166 if (!r2 || (read_c0_cause() & (1 << 30)))
167 timer_interrupt(irq, NULL, regs); 167 timer_interrupt(irq, NULL);
168 168
169 scroll_display_message(); 169 scroll_display_message();
170 } else { 170 } else {
@@ -180,7 +180,7 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
180 /* 180 /*
181 * Other CPUs should do profiling and process accounting 181 * Other CPUs should do profiling and process accounting
182 */ 182 */
183 local_timer_interrupt(irq, dev_id, regs); 183 local_timer_interrupt(irq, dev_id);
184 } 184 }
185out: 185out:
186#endif /* CONFIG_MIPS_MT_SMTC */ 186#endif /* CONFIG_MIPS_MT_SMTC */