Skip to contentSkip to conversation

perf/urgent annotate s390 fix

GIT PULL New Arnaldo Carvalho de Melo 2 participants 3 messages Apr 11, 2017

Subsystems (2)
lore
Share & tools
lore

Arnaldo Carvalho de Melo

author maintainer
#0 lore raw

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit a01851faab4b485e94c2ceaa1d0208a8d16ce367:

Merge tag 'perf-urgent-for-mingo-4.11-20170317' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2017-03-17 15:13:28 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-4.11-20170411

for you to fetch changes up to 3c1a427954399fd1bda1ee7e1b356f47b61cee74:

perf annotate s390: Fix perf annotate error -95 (4.10 regression) (2017-04-07 12:33:10 -0300)

----------------------------------------------------------------
perf/urgent annotate fix for s390:

- The move to support cross arch annotation introduced per arch initialization requirements, fullfill them for s/390 (Christian Borntraeger)

----------------------------------------------------------------
Christian Borntraeger (1):
perf annotate s390: Fix perf annotate error -95 (4.10 regression)

 tools/perf/util/annotate.c | 6 ++++++
 1 file changed, 6 insertions(+)
author maintainer
#1 lore raw

PATCH 1/1 perf annotate s390: Fix perf annotate error -95 (4.10 regression)

From: Christian Borntraeger <[email protected]>

since 4.10 perf annotate exits on s390 with an "unknown error -95". Turns out that commit 786c1b51844d ("perf annotate: Start supporting cross arch annotation") added a hard requirement for architecture support when objdump is used but only provided x86 and arm support. Meanwhile power was added so lets add s390 as well.

While at it make sure to implement the branch and jump types.

Cc Andreas Krebbel <[email protected]>
Cc Hendrik Brueckner <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc linux-s390 <[email protected]>
Cc [email protected] # v4.10+
Fixes 786c1b51844 "perf annotate: Start supporting cross arch annotation"
---
 tools/perf/util/annotate.c | 6 ++++++
 1 file changed, 6 insertions(+)
tools/perf/util/annotate.c +6 -0
index 273f21fa32b5..7aa57225cbf7 100644
@@ -130,6 +130,12 @@ static struct arch architectures[] = {
 		.name = "powerpc",
 		.init = powerpc__annotate_init,
 	},
+	{
+		.name = "s390",
+		.objdump =  {
+			.comment_char = '#',
+		},
+	},
 };
 
 static void ins__delete(struct ins_operands *ops)
Signature · 1 line
2.9.3
#2 lore raw
In reply to Arnaldo Carvalho de Melo
Quoted 24 lines · Arnaldo Carvalho de Melo

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit a01851faab4b485e94c2ceaa1d0208a8d16ce367:

Merge tag 'perf-urgent-for-mingo-4.11-20170317' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2017-03-17 15:13:28 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-4.11-20170411

for you to fetch changes up to 3c1a427954399fd1bda1ee7e1b356f47b61cee74:

perf annotate s390: Fix perf annotate error -95 (4.10 regression) (2017-04-07 12:33:10 -0300)

----------------------------------------------------------------
perf/urgent annotate fix for s390:

- The move to support cross arch annotation introduced per arch initialization requirements, fullfill them for s/390 (Christian Borntraeger)

Quoted 8 lines

----------------------------------------------------------------
Christian Borntraeger (1):
perf annotate s390: Fix perf annotate error -95 (4.10 regression)

 tools/perf/util/annotate.c | 6 ++++++
 1 file changed, 6 insertions(+)

Pulled, thanks Arnaldo!

Ingo