diff options
author | 2022-04-14 16:55:47 +0200 | |
---|---|---|
committer | 2022-04-14 16:55:47 +0200 | |
commit | ce8abf340e40e1126bfcb9e7679b3d6b524ae3e0 (patch) | |
tree | 4f009a42fa3c00d7e2d2fd83b59023674d2e34ba /tools/perf/util/annotate.c | |
parent | tracing/timer: Add missing argument documentation of trace points (diff) | |
parent | timekeeping: Introduce fast accessor to clock tai (diff) | |
download | linux-dev-ce8abf340e40e1126bfcb9e7679b3d6b524ae3e0.tar.xz linux-dev-ce8abf340e40e1126bfcb9e7679b3d6b524ae3e0.zip |
Merge tag 'tai-for-tracing' into timers/core
Pull in the NMI safe TAI accessor which was provided for the tracing tree
to prepare for further changes in this area.
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 e4c641b240df..82cc396ef516 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2047,6 +2047,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) objdump_process.argv = objdump_argv; objdump_process.out = -1; objdump_process.err = -1; + objdump_process.no_stderr = 1; if (start_command(&objdump_process)) { pr_err("Failure starting to run %s\n", command); err = -1; |