diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-03-08 13:11:46 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-03-08 13:13:08 +1100 |
| commit | 04a5b0ee97046293431685404ef7352917f1e243 (patch) | |
| tree | a08d6eb6bb8b37dce0fceb472fc3dd506ce1d295 /tools/perf/util/annotate.c | |
| parent | c7fa848ff01dad9ed3146a6b1a7d3622131bcedd (diff) | |
| parent | 93b71801a8274cd9511557faf04365a5de487197 (diff) | |
Merge branch 'kvm-ppc-cap-210' of https://git.kernel.org/pub/scm/virt/kvm/kvm into topic/ppc-kvm
Merge this branch from the KVM tree to bring in a new KVM capability
KVM_CAP_PPC_AIL_MODE_3.
It also brings in some unrelated KVM changes as well as v5.17-rc3.
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; |