diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-30 08:59:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-30 09:01:40 +0200 |
| commit | 55b78e34b12d07b8ab7d7732fd24892df8eea5c7 (patch) | |
| tree | dead7017e67403bdae20db5f2a3a409af9eea7d3 /tools/perf/builtin-annotate.c | |
| parent | c985f7812331d79483beab932e8966477411a942 (diff) | |
| parent | a44b45f236dd1c1a8caccf9a078adf2941a20267 (diff) | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Fixes for perf/urgent from Arnaldo Carvalho de Melo:
* Fix fallback to --stdio when TUI not supported, from Namhyung Kim.
* Use right cast for pointers/long in libtraceevent, from Namhyung Kim.
* Be consistent on using the right error reporting interface for fatal errors,
from Namhyung Kim.
* Fix fallback to --stdio when TUI not supported, from Namhyung Kim.
* Use the right index in asm only view in the annotate browser.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 806e0a28663..67522cf8740 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -215,7 +215,7 @@ static int __cmd_annotate(struct perf_annotate *ann) } if (total_nr_samples == 0) { - ui__warning("The %s file has no samples!\n", session->filename); + ui__error("The %s file has no samples!\n", session->filename); goto out_delete; } out_delete: |