diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-11-23 13:39:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-23 13:51:48 -0500 |
commit | cc612d8199089413719397c9d92e5823da578eac (patch) | |
tree | aec84294a839bc82b738326ed5f338e6ebc47a30 /tools/perf/builtin-annotate.c | |
parent | 1b290d670ffa883b7e062177463a8efd00eaa2c1 (diff) |
perf symbols: Look for vmlinux in more places
Now that we can check the buildid to see if it really matches,
this can be done safely:
vmlinux
/boot/vmlinux
/boot/vmlinux-<uts.release>
/lib/modules/<uts.release>/build/vmlinux
/usr/lib/debug/lib/modules/%s/vmlinux
More can be added - if you know about distros that put the
vmlinux somewhere else please let us know.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1259001550-8194-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r-- | tools/perf/builtin-annotate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 203152729a68..6b13a1ecf1e7 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
@@ -37,6 +37,7 @@ static bool use_modules; | |||
37 | 37 | ||
38 | static unsigned long page_size; | 38 | static unsigned long page_size; |
39 | static unsigned long mmap_window = 32; | 39 | static unsigned long mmap_window = 32; |
40 | const char *vmlinux_name; | ||
40 | 41 | ||
41 | struct sym_hist { | 42 | struct sym_hist { |
42 | u64 sum; | 43 | u64 sum; |
@@ -637,7 +638,7 @@ static int __cmd_annotate(void) | |||
637 | exit(0); | 638 | exit(0); |
638 | } | 639 | } |
639 | 640 | ||
640 | if (kernel_maps__init(use_modules) < 0) { | 641 | if (kernel_maps__init(vmlinux_name, true, use_modules) < 0) { |
641 | pr_err("failed to create kernel maps for symbol resolution\b"); | 642 | pr_err("failed to create kernel maps for symbol resolution\b"); |
642 | return -1; | 643 | return -1; |
643 | } | 644 | } |