Commit b02b41c8 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf/core: Fix event timekeeping merge 



Due to an oversight in merging:

  da916e96 ("perf: Make perf_pmu_unregister() useable")

on top of:

  a3c3c666 ("perf/core: Fix child_total_time_enabled accounting bug at task exit")

the timekeeping fix from this latter patch got undone.

Redo it.

Fixes: da916e96 ("perf: Make perf_pmu_unregister() useable")
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20250417080815.GI38216@noisy.programming.kicks-ass.net
parent 162c9e3f

kernel/events/core.c

+2 −2
Original line number Diff line number Diff line
@@ -2500,14 +2500,14 @@ __perf_remove_from_context(struct perf_event *event, 
		state = PERF_EVENT_STATE_DEAD;

	}

	event_sched_out(event, ctx);

	perf_event_set_state(event, min(event->state, state));



	if (flags & DETACH_GROUP)

		perf_group_detach(event);

	if (flags & DETACH_CHILD)

		perf_child_detach(event);

	list_del_event(event, ctx);



	event->state = min(event->state, state);



	if (!pmu_ctx->nr_events) {

		pmu_ctx->rotate_necessary = 0;