diff options
author | 2022-03-15 14:06:06 -0700 | |
---|---|---|
committer | 2022-03-15 14:06:06 -0700 | |
commit | 99105cc81885e1278c927cdff15a3fdef5c29289 (patch) | |
tree | c48ea12335dc9006df715a05433f3f19a3570ff7 /tools/perf/util/annotate.c | |
parent | clk: ti: Update component clocks to use ti_dt_clk_name() (diff) | |
parent | Linux 5.17-rc4 (diff) | |
download | linux-dev-99105cc81885e1278c927cdff15a3fdef5c29289.tar.xz linux-dev-99105cc81885e1278c927cdff15a3fdef5c29289.zip |
Merge tag 'v5.17-rc4' into clk-ti
We want to get commit 31aa7056bbec ("ARM: dts: Don't use legacy clock
defines for dra7 clkctrl") so merge in the nearest rc.
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 01900689dc00..8190a124b99d 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2036,6 +2036,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) memset(&objdump_process, 0, sizeof(objdump_process)); objdump_process.argv = objdump_argv; objdump_process.out = -1; + objdump_process.err = -1; if (start_command(&objdump_process)) { pr_err("Failure starting to run %s\n", command); err = -1; |