Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304851
b: refs/heads/master
c: c4cceae
h: refs/heads/master
i:
  304849: 2bae3ee
  304847: 735e6ab
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed Apr 20, 2012
1 parent 5e1a69d commit 27c8932
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4ea08b522071c6c34098b7a880aac3551abecd75
refs/heads/master: c4cceae3ba786c136b0cf568359863d74897a48a
13 changes: 9 additions & 4 deletions trunk/tools/perf/ui/browsers/annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -599,10 +599,15 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
ui_helpline__puts("Huh? No selection. Report to linux-kernel@vger.kernel.org");
else if (self->selection->offset == -1)
ui_helpline__puts("Actions are only available for assembly lines.");
else if (!self->selection->ins ||
!(annotate_browser__jump(self) ||
annotate_browser__callq(self, evidx, timer, arg, delay_secs)))
ui_helpline__puts("Actions are only available for the 'callq' and jump instructions.");
else if (!self->selection->ins) {
if (strcmp(self->selection->name, "retq"))
goto show_sup_ins;
goto out;
} else if (!(annotate_browser__jump(self) ||
annotate_browser__callq(self, evidx, timer, arg, delay_secs))) {
show_sup_ins:
ui_helpline__puts("Actions are only available for 'callq', 'retq' & jump instructions.");
}
continue;
case K_LEFT:
case K_ESC:
Expand Down

0 comments on commit 27c8932

Please sign in to comment.