diff options
| author | Paul Cercueil <paul@crapouillou.net> | 2022-04-18 20:44:36 +0100 |
|---|---|---|
| committer | Paul Cercueil <paul@crapouillou.net> | 2022-04-18 20:46:55 +0100 |
| commit | 40f458b7816bd3ddddc068998523b4e039c04818 (patch) | |
| tree | f88d18bd293fb646a53cc025fa72329b0f738e97 /tools/perf/util/annotate.c | |
| parent | c6ed9f66eb70aeaac9998bd3552ada740d90e20c (diff) | |
| parent | c54b39a565227538c52ead2349eb17d54aadd6f7 (diff) | |
Merge drm/drm-next into drm-misc-next
drm/drm-next has a build fix for the NewVision NV3052C panel
(drivers/gpu/drm/panel/panel-newvision-nv3052c.c), which needs to be
merged back to drm-misc-next, as it was failing to build there.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
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 e4c641b240df4..82cc396ef516c 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; |