projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
kernel
/
events
/
core.c
diff --git
a/kernel/events/core.c
b/kernel/events/core.c
index
9fc3be0
..
5c02f67
100644
(file)
--- a/
kernel/events/core.c
+++ b/
kernel/events/core.c
@@
-3929,7
+3929,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))