Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b47c25 authored by Gleb Natapov's avatar Gleb Natapov Committed by Ingo Molnar
Browse files

perf: Do no try to schedule task events if there are none 



perf_event_sched_in() shouldn't try to schedule task events if there
are none otherwise task's ctx->is_active will be set and will not be
cleared during sched_out. This will prevent newly added events from
being scheduled into the task context.

Fixes a boo-boo in commit 1d5f003f ("perf: Do not set task_ctx
pointer in cpuctx if there are no events in the context").

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20111122140821.GF2557@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a33caeb1

kernel/events/core.c

+2 −2
Original line number Diff line number Diff line
@@ -2174,11 +2174,11 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx, 
	 */

	cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);



	perf_event_sched_in(cpuctx, ctx, task);



	if (ctx->nr_events)

		cpuctx->task_ctx = ctx;



	perf_event_sched_in(cpuctx, cpuctx->task_ctx, task);



	perf_pmu_enable(ctx->pmu);

	perf_ctx_unlock(cpuctx, ctx);