diff options
| author |   Felix Fietkau <nbd@openwrt.org> | 2012-05-02 17:33:04 +0200 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2012-05-15 17:49:19 +0200 |
| commit | 3572a2c37f667ee49333f8863722b8f43eac506b (patch) | |
| tree | 0c33d196770577509403447e6fda88e9b012d3b6 /arch/mips/kernel | |
| parent | Linux 3.4-rc7 (diff) | |
| download | linux-dev-3572a2c37f667ee49333f8863722b8f43eac506b.tar.xz linux-dev-3572a2c37f667ee49333f8863722b8f43eac506b.zip | |
MIPS: make oprofile use cp0_perfcount_irq if it is set
Make the oprofile code use the performance counters irq.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3723/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/perf_event_mipsxx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index 811084f4e422..574b4e9df50f 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -1532,7 +1532,8 @@ init_hw_perf_events(void) irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR; } else { #endif - if (cp0_perfcount_irq >= 0) + if ((cp0_perfcount_irq >= 0) && + (cp0_compare_irq != cp0_perfcount_irq)) irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq; else irq = -1; |