diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-30 15:08:26 +0300 | 
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-30 15:08:26 +0300 | 
| commit | cd4846c5a68da77705164924f47001af3b499dec (patch) | |
| tree | 226295e35148ee7a9d303c6a218790b7a8107976 /tools/perf/ui/browsers/annotate.c | |
| parent | 9ee84466b7130360d07241baf4c95a553fc0a997 (diff) | |
| parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 (diff) | |
| download | linux-cd4846c5a68da77705164924f47001af3b499dec.tar.xz | |
Merge 4.17-rc3 into driver-core-next
We want the fixes in here as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
| -rw-r--r-- | tools/perf/ui/browsers/annotate.c | 5 | 
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 12c099a87f8b..3781d74088a7 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -692,6 +692,7 @@ static int annotate_browser__run(struct annotate_browser *browser,  		"J             Toggle showing number of jump sources on targets\n"  		"n             Search next string\n"  		"o             Toggle disassembler output/simplified view\n" +		"O             Bump offset level (jump targets -> +call -> all -> cycle thru)\n"  		"s             Toggle source code view\n"  		"t             Circulate percent, total period, samples view\n"  		"/             Search string\n" @@ -719,6 +720,10 @@ static int annotate_browser__run(struct annotate_browser *browser,  			notes->options->use_offset = !notes->options->use_offset;  			annotation__update_column_widths(notes);  			continue; +		case 'O': +			if (++notes->options->offset_level > ANNOTATION__MAX_OFFSET_LEVEL) +				notes->options->offset_level = ANNOTATION__MIN_OFFSET_LEVEL; +			continue;  		case 'j':  			notes->options->jump_arrows = !notes->options->jump_arrows;  			continue;  | 
