summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-09-23 07:20:33 +0200
committerIngo Molnar <mingo@kernel.org>2016-09-23 07:20:33 +0200
commit739f1bcd045f473d79358aac94439722d41a2650 (patch)
treea8cfdff0a9b798acb618ba2b79861af723b217db /kernel/events
parent89f1c2c59c4aef8e26edbc7db5175e6ffb0e9ec7 (diff)
parent3bf6215a1b30db7df6083c708caab3fe1a8e8abe (diff)
downloadlinux-739f1bcd045f473d79358aac94439722d41a2650.tar.bz2
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index fedba316cca0..7c0d263f6bc5 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3958,7 +3958,7 @@ static void exclusive_event_destroy(struct perf_event *event)
static bool exclusive_event_match(struct perf_event *e1, struct perf_event *e2)
{
- if ((e1->pmu->capabilities & PERF_PMU_CAP_EXCLUSIVE) &&
+ if ((e1->pmu == e2->pmu) &&
(e1->cpu == e2->cpu ||
e1->cpu == -1 ||
e2->cpu == -1))