diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-10-20 08:51:35 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-20 08:51:35 (GMT) |
commit | e4f8eaad70ea186b8da290c99239dce721a34f88 (patch) | |
tree | 29083a5fab8cf752e01977addc4b958c05b9d346 /tools/perf/util/probe-finder.c | |
parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
parent | 3090ffb5a2515990182f3f55b0688a7817325488 (diff) | |
download | linux-fsl-qoriq-e4f8eaad70ea186b8da290c99239dce721a34f88.tar.xz |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
" * Fix build error on Fedora 12.
* Fix to initialize fname always before use it, bug introduced
during this merge window, from Masami Hiramatsu.
* Disable PERF_RECORD_MMAP2 support, from Stephane Eranian. "
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/probe-finder.c')
-rw-r--r-- | tools/perf/util/probe-finder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index c09e0a9..f069273 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -1357,10 +1357,10 @@ int debuginfo__find_probe_point(struct debuginfo *self, unsigned long addr, goto post; } + fname = dwarf_decl_file(&spdie); if (addr == (unsigned long)baseaddr) { /* Function entry - Relative line number is 0 */ lineno = baseline; - fname = dwarf_decl_file(&spdie); goto post; } |