aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/symbol.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-08-18 21:58:46 +0200
committerIngo Molnar <mingo@elte.hu>2011-08-18 21:58:46 +0200
commit51887c8230d57c4d9cc68e3784c52c8f0a708655 (patch)
tree70509225468cddacb24eccdc78c7d8fc9e0197c5 /tools/perf/util/symbol.c
parentMerge branch 'perf/urgent' into perf/core (diff)
parentperf stat: Add -o and --append options (diff)
downloadlinux-dev-51887c8230d57c4d9cc68e3784c52c8f0a708655.tar.xz
linux-dev-51887c8230d57c4d9cc68e3784c52c8f0a708655.zip
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/util/symbol.c')
-rw-r--r--tools/perf/util/symbol.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 469c0264ed29..245e60d6b4e7 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -46,6 +46,8 @@ struct symbol_conf symbol_conf = {
.exclude_other = true,
.use_modules = true,
.try_vmlinux_path = true,
+ .annotate_asm_raw = true,
+ .annotate_src = true,
.symfs = "",
};