aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-08-16 19:26:10 +0200
committerIngo Molnar <mingo@elte.hu>2010-08-16 19:26:10 +0200
commitf24645a991e6758a4544ed7667cf919fea328a95 (patch)
treea4493eb78c81d0f5b232f86fd330616f75ead775
parentMerge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4 (diff)
parentperf annotate tui: Fix exit and RIGHT keys handling (diff)
downloadlinux-dev-f24645a991e6758a4544ed7667cf919fea328a95.tar.xz
linux-dev-f24645a991e6758a4544ed7667cf919fea328a95.zip
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.c3
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 55ff792459ac..a90273e63f4f 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)