diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-16 10:41:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-16 10:41:21 -0700 |
| commit | b44eeb4d47b2a7e3e3494fff126b66338b360ce3 (patch) | |
| tree | 1680a39b12f848cdf277b00c2eb00932e446b45d /tools/perf/util/machine.c | |
| parent | 4f87dac386cc43d5525da7a939d4b4e7edbea22c (diff) | |
| parent | b7b4839d93e50adccef29eccb694807cdcb8bee3 (diff) | |
| download | linux-b44eeb4d47b2a7e3e3494fff126b66338b360ce3.tar.gz linux-b44eeb4d47b2a7e3e3494fff126b66338b360ce3.tar.bz2 linux-b44eeb4d47b2a7e3e3494fff126b66338b360ce3.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc smaller fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Fix leak in uncore_type_init failure paths
perf machine: Use map as success in ip__resolve_ams
perf symbols: Fix crash in elf_section_by_name
perf trace: Decode architecture-specific signal numbers
Diffstat (limited to 'tools/perf/util/machine.c')
| -rw-r--r-- | tools/perf/util/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index c872991e0f65..620a1983b76b 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1213,7 +1213,7 @@ static void ip__resolve_ams(struct machine *machine, struct thread *thread, */ thread__find_addr_location(thread, machine, m, MAP__FUNCTION, ip, &al); - if (al.sym) + if (al.map) goto found; } found: |