diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-11 02:13:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-11 02:13:55 -0400 |
commit | 5dcefda0fd87fefa440abc9b9d3f1089229f8911 (patch) | |
tree | f19697dc461b40e277109fbba659d614892bb0d2 /tools/perf/ui/browsers/annotate.c | |
parent | c4f400e837713f677de94390c57e7dc7567e0286 (diff) | |
parent | 5a5626b1b4bf8467891c9297ffda979db97ed5ec (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Fixes and improvements for perf/core:
- perf_target: abstraction for --uid, --pid, --tid, --cpu, --all-cpus handling,
eliminating code duplicated in the tools, having constraints that apply to
all of them, from Namhyung Kim
- Fixes for handling fallback to cpu-clock on PPC, from David Ahern
- Fix for processing events with unknown size, from Jiri Olsa
- Compilation fix on 32-bit, from Jiri Olsa
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
-rw-r--r-- | tools/perf/ui/browsers/annotate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index f171b4627cb1..06367c1df720 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c | |||
@@ -547,9 +547,9 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, | |||
547 | struct map_symbol *ms = self->b.priv; | 547 | struct map_symbol *ms = self->b.priv; |
548 | struct symbol *sym = ms->sym; | 548 | struct symbol *sym = ms->sym; |
549 | const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, " | 549 | const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, " |
550 | "H: Go to hottest line, ->/ENTER: Line action, " | 550 | "H: Hottest line, ->/ENTER: Line action, " |
551 | "O: Toggle offset view, " | 551 | "O: Offset view, " |
552 | "S: Toggle source code view"; | 552 | "S: Source view"; |
553 | int key; | 553 | int key; |
554 | 554 | ||
555 | if (ui_browser__show(&self->b, sym->name, help) < 0) | 555 | if (ui_browser__show(&self->b, sym->name, help) < 0) |