aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Dearman <chris@mips.com>2007-06-21 07:59:57 -0400
committerRalf Baechle <ralf@linux-mips.org>2007-07-06 11:17:11 -0400
commitc3e838a2cbb0f14af4d718160933523ac4c37adf (patch)
tree37f41332212861826d18aff9c373846d31a93174
parent6fb88ce04f545ca7da15a7b447783bb7a4615511 (diff)
[MIPS] Fix timer/performance interrupt detection
Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/kernel/traps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index b1233644fcca..3ea7863c4519 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1372,12 +1372,12 @@ void __init per_cpu_trap_init(void)
1372 */ 1372 */
1373 if (cpu_has_mips_r2) { 1373 if (cpu_has_mips_r2) {
1374 cp0_compare_irq = (read_c0_intctl () >> 29) & 7; 1374 cp0_compare_irq = (read_c0_intctl () >> 29) & 7;
1375 cp0_perfcount_irq = -1;
1376 } else {
1377 cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
1378 cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7; 1375 cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7;
1379 if (cp0_perfcount_irq != cp0_compare_irq) 1376 if (cp0_perfcount_irq == cp0_compare_irq)
1380 cp0_perfcount_irq = -1; 1377 cp0_perfcount_irq = -1;
1378 } else {
1379 cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
1380 cp0_perfcount_irq = -1;
1381 } 1381 }
1382 1382
1383#ifdef CONFIG_MIPS_MT_SMTC 1383#ifdef CONFIG_MIPS_MT_SMTC