diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-09-30 15:44:13 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-06 13:05:44 +0100 |
| commit | f8304a9310c3369b6003dcc78c06a5c82845eba7 (patch) | |
| tree | d9155db6b4d0872b2a2135b5ab38af4e736b97eb /tools | |
| parent | 4e2ca0c9143c4011f3f997f5f5a066e6ccc6beef (diff) | |
| download | linux-stable-f8304a9310c3369b6003dcc78c06a5c82845eba7.tar.gz linux-stable-f8304a9310c3369b6003dcc78c06a5c82845eba7.tar.bz2 linux-stable-f8304a9310c3369b6003dcc78c06a5c82845eba7.zip | |
perf annotate: Propagate the symbol__annotate() error return
[ Upstream commit 211f493b611eef012841f795166c38ec7528738d ]
We were just returning -1 in symbol__annotate() when symbol__annotate()
failed, propagate its error as it is used later to pass to
symbol__strerror_disassemble() to present a error message to the user,
that in some cases were getting:
"Invalid -1 error code"
Fix it to propagate the error.
Reported-by: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/n/tip-0tj89rs9g7nbcyd5skadlvuu@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/annotate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index b4946ef48b62..83a3ad4256c5 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2757,7 +2757,7 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *ev out_free_offsets: zfree(¬es->offsets); - return -1; + return err; } #define ANNOTATION__CFG(n) \ |