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>

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 6e0ef79be169..aaf36ce0b6fe 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -300,10 +300,14 @@ static void annotate_browser__set_rb_top(struct annotate_browser *browser,
 {
         struct browser_disasm_line *bpos;
         struct disasm_line *pos;
+        u32 idx;
 
         bpos = rb_entry(nd, struct browser_disasm_line, rb_node);
         pos = ((struct disasm_line *)bpos) - 1;
-        annotate_browser__set_top(browser, pos, bpos->idx);
+        idx = bpos->idx;
+        if (browser->hide_src_code)
+                idx = bpos->idx_asm;
+        annotate_browser__set_top(browser, pos, idx);
         browser->curr_hot = nd;
 }