Merge branch 'pm-sleep'

[cascardo/linux.git] / tools / perf / ui / browsers / annotate.c

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 0e106bb..29dc6d2 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -223,16 +223,14 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                        } else if (ins__is_call(dl->ins)) {
                                ui_browser__write_graph(browser, SLSMG_RARROW_CHAR);
                                SLsmg_write_char(' ');
+                       } else if (ins__is_ret(dl->ins)) {
+                               ui_browser__write_graph(browser, SLSMG_LARROW_CHAR);
+                               SLsmg_write_char(' ');
                        } else {
                                ui_browser__write_nstring(browser, " ", 2);
                        }
                } else {
-                       if (strcmp(dl->name, "retq")) {
-                               ui_browser__write_nstring(browser, " ", 2);
-                       } else {
-                               ui_browser__write_graph(browser, SLSMG_LARROW_CHAR);
-                               SLsmg_write_char(' ');
-                       }
+                       ui_browser__write_nstring(browser, " ", 2);
                }
 
                disasm_line__scnprintf(dl, bf, sizeof(bf), !annotate_browser__opts.use_offset);
@@ -843,14 +841,14 @@ show_help:
                                ui_helpline__puts("Huh? No selection. Report to linux-kernel@vger.kernel.org");
                        else if (browser->selection->offset == -1)
                                ui_helpline__puts("Actions are only available for assembly lines.");
-                       else if (!browser->selection->ins) {
-                               if (strcmp(browser->selection->name, "retq"))
-                                       goto show_sup_ins;
+                       else if (!browser->selection->ins)
+                               goto show_sup_ins;
+                       else if (ins__is_ret(browser->selection->ins))
                                goto out;
-                       } else if (!(annotate_browser__jump(browser) ||
+                       else if (!(annotate_browser__jump(browser) ||
                                     annotate_browser__callq(browser, evsel, hbt))) {
 show_sup_ins:
-                               ui_helpline__puts("Actions are only available for 'callq', 'retq' & jump instructions.");
+                               ui_helpline__puts("Actions are only available for function call/return & jump/branch instructions.");
                        }
                        continue;
                case 't':