diff options
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index ac9805e0bc76..70de8f6b3aee 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -1723,15 +1723,14 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) | |||
1723 | err = asprintf(&command, | 1723 | err = asprintf(&command, |
1724 | "%s %s%s --start-address=0x%016" PRIx64 | 1724 | "%s %s%s --start-address=0x%016" PRIx64 |
1725 | " --stop-address=0x%016" PRIx64 | 1725 | " --stop-address=0x%016" PRIx64 |
1726 | " -l -d %s %s -C \"%s\" 2>/dev/null|grep -v \"%s:\"|expand", | 1726 | " -l -d %s %s -C \"$1\" 2>/dev/null|grep -v \"$1:\"|expand", |
1727 | opts->objdump_path ?: "objdump", | 1727 | opts->objdump_path ?: "objdump", |
1728 | opts->disassembler_style ? "-M " : "", | 1728 | opts->disassembler_style ? "-M " : "", |
1729 | opts->disassembler_style ?: "", | 1729 | opts->disassembler_style ?: "", |
1730 | map__rip_2objdump(map, sym->start), | 1730 | map__rip_2objdump(map, sym->start), |
1731 | map__rip_2objdump(map, sym->end), | 1731 | map__rip_2objdump(map, sym->end), |
1732 | opts->show_asm_raw ? "" : "--no-show-raw", | 1732 | opts->show_asm_raw ? "" : "--no-show-raw", |
1733 | opts->annotate_src ? "-S" : "", | 1733 | opts->annotate_src ? "-S" : ""); |
1734 | symfs_filename, symfs_filename); | ||
1735 | 1734 | ||
1736 | if (err < 0) { | 1735 | if (err < 0) { |
1737 | pr_err("Failure allocating memory for the command to run\n"); | 1736 | pr_err("Failure allocating memory for the command to run\n"); |
@@ -1756,7 +1755,8 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) | |||
1756 | close(stdout_fd[0]); | 1755 | close(stdout_fd[0]); |
1757 | dup2(stdout_fd[1], 1); | 1756 | dup2(stdout_fd[1], 1); |
1758 | close(stdout_fd[1]); | 1757 | close(stdout_fd[1]); |
1759 | execl("/bin/sh", "sh", "-c", command, NULL); | 1758 | execl("/bin/sh", "sh", "-c", command, "--", symfs_filename, |
1759 | NULL); | ||
1760 | perror(command); | 1760 | perror(command); |
1761 | exit(-1); | 1761 | exit(-1); |
1762 | } | 1762 | } |