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

Commit 1ebdfa80 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of... 

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
parents aba99437 52bcd994

tools/perf/util/evsel.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int __perf_evsel__read(struct perf_evsel *evsel, 
	int cpu, thread;

	struct perf_counts_values *aggr = &evsel->counts->aggr, count;



	aggr->val = 0;

	aggr->val = aggr->ena = aggr->run = 0;



	for (cpu = 0; cpu < ncpus; cpu++) {

		for (thread = 0; thread < nthreads; thread++) {