diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-16 19:26:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-16 19:26:10 +0200 |
| commit | f24645a991e6758a4544ed7667cf919fea328a95 (patch) | |
| tree | a4493eb78c81d0f5b232f86fd330616f75ead775 | |
| parent | d244b6bd41e09ecbb09c738cc2c108be227398c8 (diff) | |
| parent | e91846213241e3c46da8cbe992bceb1697de8d78 (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
| -rw-r--r-- | tools/perf/util/ui/browsers/annotate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c index 55ff792459a..a90273e63f4 100644 --- a/tools/perf/util/ui/browsers/annotate.c +++ b/tools/perf/util/ui/browsers/annotate.c @@ -146,6 +146,7 @@ static int annotate_browser__run(struct annotate_browser *self, return -1; newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT); + newtFormAddHotKey(self->b.form, NEWT_KEY_RIGHT); nd = self->curr_hot; if (nd) { @@ -178,7 +179,7 @@ static int annotate_browser__run(struct annotate_browser *self, } out: ui_browser__hide(&self->b); - return 0; + return es->u.key; } int hist_entry__tui_annotate(struct hist_entry *self) |