---

yaml --- r: 305509 b: refs/heads/master c: e40ee74 h: refs/heads/master i: 305507: 7d07346 v: v3
git-mirror · May 22, 2012 · 02d778c · 02d778c
1 parent 01422b7
commit 02d778c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e33387fc2748ac78fd577dee2c914fc3ea0ba0cd
+refs/heads/master: e40ee742d4542b4c046ac5426654b1494d87ad73
diff --git a/trunk/tools/perf/builtin-top.c b/trunk/tools/perf/builtin-top.c
@@ -900,6 +900,9 @@ static void perf_top__start_counters(struct perf_top *top)
 			attr->read_format |= PERF_FORMAT_ID;
 		}
 
+		if (perf_target__has_cpu(&top->target))
+			attr->sample_type |= PERF_SAMPLE_CPU;
+
 		if (symbol_conf.use_callchain)
 			attr->sample_type |= PERF_SAMPLE_CALLCHAIN;
 

diff --git a/trunk/tools/perf/util/evsel.c b/trunk/tools/perf/util/evsel.c
@@ -108,7 +108,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts,
 	if (opts->call_graph)
 		attr->sample_type	|= PERF_SAMPLE_CALLCHAIN;
 
-	if (opts->target.system_wide)
+	if (perf_target__has_cpu(&opts->target))
 		attr->sample_type	|= PERF_SAMPLE_CPU;
 
 	if (opts->period)