From eda5ae2ef40383186fc868dabcca66267732600e Mon Sep 17 00:00:00 2001 From: Chris Dearman Date: Thu, 21 Jun 2007 12:59:57 +0100 Subject: [PATCH] --- yaml --- r: 58231 b: refs/heads/master c: c3e838a2cbb0f14af4d718160933523ac4c37adf h: refs/heads/master i: 58229: d564d6426b468b0c1d61a59ed942248369ef47c3 58227: 2cfe19bf2fa33d0154dbee8140fe114c79e29fdf 58223: 3b3e2bbf727c6b52d53222d2ca0c2aaa0703ac9a v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/traps.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cfd270060a1d..d49ac806949e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fb88ce04f545ca7da15a7b447783bb7a4615511 +refs/heads/master: c3e838a2cbb0f14af4d718160933523ac4c37adf diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c index b1233644fcca..3ea7863c4519 100644 --- a/trunk/arch/mips/kernel/traps.c +++ b/trunk/arch/mips/kernel/traps.c @@ -1372,12 +1372,12 @@ void __init per_cpu_trap_init(void) */ if (cpu_has_mips_r2) { cp0_compare_irq = (read_c0_intctl () >> 29) & 7; - cp0_perfcount_irq = -1; - } else { - cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7; - if (cp0_perfcount_irq != cp0_compare_irq) + if (cp0_perfcount_irq == cp0_compare_irq) cp0_perfcount_irq = -1; + } else { + cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; + cp0_perfcount_irq = -1; } #ifdef CONFIG_MIPS_MT_SMTC