diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-05 12:39:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-05 12:39:12 +0200 |
| commit | 8a06bf14008fbf55a86105b8569494f4beeb8762 (patch) | |
| tree | 74c0313294eb9dc2bb409ce5ea154b478c6628cd /tools/perf/builtin-report.c | |
| parent | e7882d6c40874a5b5033ca85f7508a602a60b662 (diff) | |
| parent | 7f309ed6453926a81e2a97d274f67f1e48f0d74c (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core fixes and some late updates from Arnaldo Carvalho de Melo:
* Make clean brace expansion fix for some shells, from Palmer Cox
* Warn user just once per guest kernel when not finding kernel info,
from David Ahern
* perf test fix from Jiri Olsa
* Fix error handling on event creation in perf top, from David Ahern
* Fix check on perf_target__strnerror, from Namhyung Kim
* Save the whole cmdline, from David Ahern
* Prep work for the DWARF CFI post unwinder, so that it doesn't
uses perf_session in lots of places, just evlist/evsel is enough.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-report.c')
| -rw-r--r-- | tools/perf/builtin-report.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 69b1c1185159..7c88a243b5db 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -249,8 +249,9 @@ static int process_read_event(struct perf_tool *tool, static int perf_report__setup_sample_type(struct perf_report *rep) { struct perf_session *self = rep->session; + u64 sample_type = perf_evlist__sample_type(self->evlist); - if (!self->fd_pipe && !(self->sample_type & PERF_SAMPLE_CALLCHAIN)) { + if (!self->fd_pipe && !(sample_type & PERF_SAMPLE_CALLCHAIN)) { if (sort__has_parent) { ui__error("Selected --sort parent, but no " "callchain data. Did you call " @@ -274,7 +275,7 @@ static int perf_report__setup_sample_type(struct perf_report *rep) if (sort__branch_mode == 1) { if (!self->fd_pipe && - !(self->sample_type & PERF_SAMPLE_BRANCH_STACK)) { + !(sample_type & PERF_SAMPLE_BRANCH_STACK)) { ui__error("Selected -b but no branch data. " "Did you call perf record without -b?\n"); return -1; |