The following commit has been merged into the perf/urgent branch of tip: Commit-ID: 8c7855d82933bab7fa5e96f0e568fc125c2e1ab4 Gitweb: https://git.kernel.org/tip/8c7855d82933bab7fa5e96f0e568fc125c2e1ab4 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Thu, 29 Oct 2020 16:28:25 +01:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Mon, 09 Nov 2020 18:12:35 +01:00 perf: Simplify group_sched_out() Since event_sched_out() clears cpuctx->exclusive upon removal of an exclusive event (and only group leaders can be exclusive), there is no point in group_sched_out() trying to do it too. It is impossible for cpuctx->exclusive to still be set here. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20201029162901.904060564@xxxxxxxxxxxxx --- kernel/events/core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index d67c9cb..9a57366 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2312,9 +2312,6 @@ group_sched_out(struct perf_event *group_event, event_sched_out(event, cpuctx, ctx); perf_pmu_enable(ctx->pmu); - - if (group_event->attr.exclusive) - cpuctx->exclusive = 0; } #define DETACH_GROUP 0x01UL
|