aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/annotate.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2024-04-22 13:35:18 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2024-04-22 13:35:18 -0300
commit173b0b5b0e865348684c02bd9cb1d22b5d46e458 (patch)
treea42a2cc8b724b94a9478aedfcbfabcec0197b246 /tools/perf/util/annotate.c
parentRevert "tools headers: Remove almost unused copy of uapi/stat.h, add few conditional defines" (diff)
parentLinux 6.9-rc5 (diff)
downloadlinux-rng-173b0b5b0e865348684c02bd9cb1d22b5d46e458.tar.xz
linux-rng-173b0b5b0e865348684c02bd9cb1d22b5d46e458.zip
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up fixes sent via perf-tools, by Namhyung Kim. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r--tools/perf/util/annotate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 7595c8fbc2c5..dca2c08ab8c5 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -906,6 +906,9 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,
if (parch)
*parch = arch;
+ if (!list_empty(&notes->src->source))
+ return 0;
+
args.arch = arch;
args.ms = *ms;