diff options
author | Tejun Heo <tj@kernel.org> | 2016-09-06 19:35:56 +0300 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-09-06 19:35:56 +0300 |
commit | 2536524a91fe5c5a9fddd282fd4e79ee0976aefe (patch) | |
tree | 30eb5b4cd6d9ed4fda69526537d4fac454cbc5e6 /tools/perf/util/unwind-libunwind-local.c | |
parent | 7d36dd00ab8d57134cce86ad4febc2f5bbdf3e72 (diff) | |
parent | bc4dee5aa72723632a1f83fd0d3720066c93b433 (diff) | |
download | linux-2536524a91fe5c5a9fddd282fd4e79ee0976aefe.tar.xz |
Merge branch 'master' into for-4.9
Diffstat (limited to 'tools/perf/util/unwind-libunwind-local.c')
-rw-r--r-- | tools/perf/util/unwind-libunwind-local.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c index 97c0f8fc5561..20c2e5743903 100644 --- a/tools/perf/util/unwind-libunwind-local.c +++ b/tools/perf/util/unwind-libunwind-local.c @@ -542,7 +542,7 @@ static int entry(u64 ip, struct thread *thread, thread__find_addr_location(thread, PERF_RECORD_MISC_USER, MAP__FUNCTION, ip, &al); - e.ip = ip; + e.ip = al.addr; e.map = al.map; e.sym = al.sym; |