From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 22 Apr 2024 16:35:18 +0000 (-0300)
Subject: Merge remote-tracking branch 'torvalds/master' into perf-tools-next
X-Git-Tag: v6.10-rc1~58^2~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=173b0b5b0e865348684c02bd9cb1d22b5d46e458;p=thirdparty%2Flinux.git

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>
---

173b0b5b0e865348684c02bd9cb1d22b5d46e458
diff --cc tools/perf/util/annotate.c
index 7595c8fbc2c5e,50ca92255ff62..dca2c08ab8c59
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@@ -906,19 -2461,15 +906,22 @@@ int symbol__annotate(struct map_symbol 
  	if (parch)
  		*parch = arch;
  
+ 	if (!list_empty(&notes->src->source))
+ 		return 0;
+ 
  	args.arch = arch;
  	args.ms = *ms;
 +
 +	if (notes->src == NULL) {
 +		notes->src = annotated_source__new();
 +		if (notes->src == NULL)
 +			return -1;
 +	}
 +
  	if (annotate_opts.full_addr)
 -		notes->start = map__objdump_2mem(ms->map, ms->sym->start);
 +		notes->src->start = map__objdump_2mem(ms->map, ms->sym->start);
  	else
 -		notes->start = map__rip_2objdump(ms->map, ms->sym->start);
 +		notes->src->start = map__rip_2objdump(ms->map, ms->sym->start);
  
  	return symbol__disassemble(sym, &args);
  }