projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
kernel
/
perf_event_mipsxx.c
diff --git
a/arch/mips/kernel/perf_event_mipsxx.c
b/arch/mips/kernel/perf_event_mipsxx.c
index ab73fa2fb9b5707343c6081b821faf9775b90a2f..f29099b104c497e5cb4b4a3d368a801fc6c60d05 100644
(file)
--- 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;