diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-30 08:54:46 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-30 08:54:46 (GMT) |
commit | 0b429e18c284af3e7a39f8ec44d95116c473fef8 (patch) | |
tree | 7957f57dc70c95a32f71896c9a526ca88b5517ad /kernel/events/core.c | |
parent | d32cdbfb0ba319e44f75437afde868f7cafdc467 (diff) | |
parent | 53061afee43bc5041b67a45b6d793e7afdcf9ca7 (diff) | |
download | linux-0b429e18c284af3e7a39f8ec44d95116c473fef8.tar.xz |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/core.c')
-rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index a54f2c2..fc9bb22 100644 --- 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)) |