summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-07 08:44:11 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-07 08:44:26 +0100
commitc7f9a6f377fa64e5a74f8c128d4349765c28fab1 (patch)
treee71eaf08c5f9179d6fd6c7e08d8539358dc76ad1 /tools
parentfe4b04fa31a6dcf4358aa84cf81e5a7fd079469b (diff)
parent8dbdea8444d303a772bceb1ba963f0e3273bfc5e (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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 2720bc1d578b..211063eed474 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,
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++) {