diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:58:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:58:46 +0200 |
| commit | 51887c8230d57c4d9cc68e3784c52c8f0a708655 (patch) | |
| tree | 70509225468cddacb24eccdc78c7d8fc9e0197c5 /tools/perf/builtin-annotate.c | |
| parent | 8bc84f87315e8bdbe242ba788fdc6a74d653b177 (diff) | |
| parent | 4aa9015f8bfd2c8d7cc33a360275b71a9d708b37 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Conflicts:
tools/perf/builtin-stat.c
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 555aefd7fe0..c5be28851f0 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -267,6 +267,12 @@ static const struct option options[] = { OPT_BOOLEAN('P', "full-paths", &full_paths, "Don't shorten the displayed pathnames"), OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"), + OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", + "Look for files with symbols relative to this directory"), + OPT_BOOLEAN('0', "source", &symbol_conf.annotate_src, + "Interleave source code with assembly code (default)"), + OPT_BOOLEAN('0', "asm-raw", &symbol_conf.annotate_asm_raw, + "Display raw encoding of assembly instructions (default)"), OPT_END() }; |