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

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

perf, x86: Properly account n_added 



Make sure n_added is properly accounted so that we can rely on the value
to reflect the number of added counters. This is needed if its going to
be used for more than a boolean check.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: paulus@samba.org
Cc: eranian@google.com
Cc: robert.richter@amd.com
Cc: fweisbec@gmail.com
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 71e2d282

arch/x86/kernel/cpu/perf_event.c

+2 −2
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static int x86_pmu_enable(struct perf_event *event) 
	memcpy(cpuc->assign, assign, n*sizeof(int));



	cpuc->n_events = n;

	cpuc->n_added  = n - n0;

	cpuc->n_added += n - n0;



	return 0;

}
@@ -1302,7 +1302,7 @@ int hw_perf_group_sched_in(struct perf_event *leader, 
	memcpy(cpuc->assign, assign, n0*sizeof(int));



	cpuc->n_events  = n0;

	cpuc->n_added   = n1;

	cpuc->n_added  += n1;

	ctx->nr_active += n1;



	/*