From 56a4db8fda6f1e121de36584bd24b8696e0f1a05 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 6 Jul 2012 23:56:00 +0200 Subject: [PATCH] --- yaml --- r: 312113 b: refs/heads/master c: c6a4ebb9ae30ead7684bce623955f74b17df496d h: refs/heads/master i: 312111: 80373707189cc7d243778d29f3f0fe3d3c4d6e10 v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/irq.h | 1 + trunk/arch/mips/kernel/traps.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d776937b5e94..a7f8d79ecc89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b876c1a0bcfe68a5eaf03f325cb2a09822bf11f2 +refs/heads/master: c6a4ebb9ae30ead7684bce623955f74b17df496d diff --git a/trunk/arch/mips/include/asm/irq.h b/trunk/arch/mips/include/asm/irq.h index fb698dc09bc9..78dbb8a86da2 100644 --- a/trunk/arch/mips/include/asm/irq.h +++ b/trunk/arch/mips/include/asm/irq.h @@ -136,6 +136,7 @@ extern void free_irqno(unsigned int irq); * IE7. Since R2 their number has to be read from the c0_intctl register. */ #define CP0_LEGACY_COMPARE_IRQ 7 +#define CP0_LEGACY_PERFCNT_IRQ 7 extern int cp0_compare_irq; extern int cp0_compare_irq_shift; diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c index 2d0c2a277f52..f985b7292cd9 100644 --- a/trunk/arch/mips/kernel/traps.c +++ b/trunk/arch/mips/kernel/traps.c @@ -1597,7 +1597,7 @@ void __cpuinit per_cpu_trap_init(bool is_boot_cpu) cp0_perfcount_irq = -1; } else { cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; - cp0_compare_irq_shift = cp0_compare_irq; + cp0_compare_irq_shift = CP0_LEGACY_PERFCNT_IRQ; cp0_perfcount_irq = -1; }