[MIPS] SMTC: Fix build error caused by nonsense code.
Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
6a05888d71
commit
cf75789953
1 changed files with 2 additions and 14 deletions
|
@ -88,8 +88,6 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
|
||||||
* the general MIPS timer_interrupt routine.
|
* the general MIPS timer_interrupt routine.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int vpflags;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We could be here due to timer interrupt,
|
* We could be here due to timer interrupt,
|
||||||
* perf counter overflow, or both.
|
* perf counter overflow, or both.
|
||||||
|
@ -98,15 +96,6 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
|
||||||
perf_irq();
|
perf_irq();
|
||||||
|
|
||||||
if (read_c0_cause() & (1 << 30)) {
|
if (read_c0_cause() & (1 << 30)) {
|
||||||
/* If timer interrupt, make it de-assert */
|
|
||||||
write_c0_compare (read_c0_count() - 1);
|
|
||||||
/*
|
|
||||||
* DVPE is necessary so long as cross-VPE interrupts
|
|
||||||
* are done via read-modify-write of Cause register.
|
|
||||||
*/
|
|
||||||
vpflags = dvpe();
|
|
||||||
clear_c0_cause(CPUCTR_IMASKBIT);
|
|
||||||
evpe(vpflags);
|
|
||||||
/*
|
/*
|
||||||
* There are things we only want to do once per tick
|
* There are things we only want to do once per tick
|
||||||
* in an "MP" system. One TC of each VPE will take
|
* in an "MP" system. One TC of each VPE will take
|
||||||
|
@ -115,14 +104,13 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
|
||||||
* the tick on VPE 0 to run the full timer_interrupt().
|
* the tick on VPE 0 to run the full timer_interrupt().
|
||||||
*/
|
*/
|
||||||
if (cpu_data[cpu].vpe_id == 0) {
|
if (cpu_data[cpu].vpe_id == 0) {
|
||||||
timer_interrupt(irq, NULL);
|
timer_interrupt(irq, NULL);
|
||||||
smtc_timer_broadcast(cpu_data[cpu].vpe_id);
|
|
||||||
} else {
|
} else {
|
||||||
write_c0_compare(read_c0_count() +
|
write_c0_compare(read_c0_count() +
|
||||||
(mips_hpt_frequency/HZ));
|
(mips_hpt_frequency/HZ));
|
||||||
local_timer_interrupt(irq, dev_id);
|
local_timer_interrupt(irq, dev_id);
|
||||||
smtc_timer_broadcast(cpu_data[cpu].vpe_id);
|
|
||||||
}
|
}
|
||||||
|
smtc_timer_broadcast(cpu_data[cpu].vpe_id);
|
||||||
}
|
}
|
||||||
#else /* CONFIG_MIPS_MT_SMTC */
|
#else /* CONFIG_MIPS_MT_SMTC */
|
||||||
int r2 = cpu_has_mips_r2;
|
int r2 = cpu_has_mips_r2;
|
||||||
|
|
Loading…
Reference in a new issue