diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-08-10 10:36:00 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-08-10 10:36:00 -0300 |
| commit | 55b290501928bb2648978257e7a00fc3a64b15fa (patch) | |
| tree | 865d9d1b30845abe3ed5605832af6961f4dc3ac7 /tools/perf/util/machine.c | |
| parent | 8c49c6e1a7b790c4cb9f464c5485117451d91c60 (diff) | |
| parent | 374a7f47bf401441edff0a64465e61326bf70a82 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up some more fixes that went upstream via the perf-tools fixes
branch.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/machine.c')
| -rw-r--r-- | tools/perf/util/machine.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 11de3ca8d4fa..88f31b3a63ac 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -45,7 +45,6 @@ static void __machine__remove_thread(struct machine *machine, struct thread_rb_node *nd, struct thread *th, bool lock); -static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms, u64 ip); static struct dso *machine__kernel_dso(struct machine *machine) { @@ -2387,10 +2386,6 @@ static int add_callchain_ip(struct thread *thread, ms.maps = maps__get(al.maps); ms.map = map__get(al.map); ms.sym = al.sym; - - if (!branch && append_inlines(cursor, &ms, ip) == 0) - goto out; - srcline = callchain_srcline(&ms, al.addr); err = callchain_cursor_append(cursor, ip, &ms, branch, flags, nr_loop_iter, |