diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-07 02:44:11 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-07 02:44:26 -0500 |
| commit | c7f9a6f377fa64e5a74f8c128d4349765c28fab1 (patch) | |
| tree | e71eaf08c5f9179d6fd6c7e08d8539358dc76ad1 /tools | |
| parent | fe4b04fa31a6dcf4358aa84cf81e5a7fd079469b (diff) | |
| parent | 8dbdea8444d303a772bceb1ba963f0e3273bfc5e (diff) | |
Merge branch 'linus' into perf/core
Merge reason: Pick up perf fixes that are now upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/evsel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 2720bc1d578..211063eed47 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
| @@ -122,7 +122,7 @@ int __perf_evsel__read(struct perf_evsel *evsel, | |||
| 122 | int cpu, thread; | 122 | int cpu, thread; |
| 123 | struct perf_counts_values *aggr = &evsel->counts->aggr, count; | 123 | struct perf_counts_values *aggr = &evsel->counts->aggr, count; |
| 124 | 124 | ||
| 125 | aggr->val = 0; | 125 | aggr->val = aggr->ena = aggr->run = 0; |
| 126 | 126 | ||
| 127 | for (cpu = 0; cpu < ncpus; cpu++) { | 127 | for (cpu = 0; cpu < ncpus; cpu++) { |
| 128 | for (thread = 0; thread < nthreads; thread++) { | 128 | for (thread = 0; thread < nthreads; thread++) { |