Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f24645a991e6758a4544ed7667cf919fea328a95

Authored by Ingo Molnar
2 parents d244b6bd41 e918462132
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme… 

…/linux-2.6 into perf/urgent

Showing 1 changed file Side-by-side Diff

tools/perf/util/ui/browsers/annotate.c
Diff comments   View file @ f24645a
... ... @@ -146,6 +146,7 @@
146 146 return -1;
147 147  
148 148 newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
  149 + newtFormAddHotKey(self->b.form, NEWT_KEY_RIGHT);
149 150  
150 151 nd = self->curr_hot;
151 152 if (nd) {
... ... @@ -178,7 +179,7 @@
178 179 }
179 180 out:
180 181 ui_browser__hide(&self->b);
181   - return 0;
  182 + return es->u.key;
182 183 }
183 184  
184 185 int hist_entry__tui_annotate(struct hist_entry *self)