diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-07 08:44:11 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-07 08:44:26 +0100 |
commit | c7f9a6f377fa64e5a74f8c128d4349765c28fab1 (patch) | |
tree | e71eaf08c5f9179d6fd6c7e08d8539358dc76ad1 /tools/perf | |
parent | perf: Cure task_oncpu_function_call() races (diff) | |
parent | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 (diff) | |
download | linux-dev-c7f9a6f377fa64e5a74f8c128d4349765c28fab1.tar.xz linux-dev-c7f9a6f377fa64e5a74f8c128d4349765c28fab1.zip |
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/perf')
-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 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++) { |