Skip to contentSkip to conversation

Patch "perf annotate s390: Fix perf annotate error -95 (4.10 regression)" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message May 17, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     perf-annotate-s390-fix-perf-annotate-error-95-4.10-regression.patch

and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e77852b32d6d4430c68c38aaf73efe5650fa25af Mon Sep 17 00:00:00 2001

From: Christian Borntraeger <[email protected]>
Date: Thu, 6 Apr 2017 09:51:51 +0200
Subject: perf annotate s390: Fix perf annotate error -95 (4.10 regression)

From: Christian Borntraeger <[email protected]>

commit e77852b32d6d4430c68c38aaf73efe5650fa25af upstream.

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]>
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
@@ -136,6 +136,12 @@ static struct arch architectures[] = {
 			.comment_char = '#',
 		},
 	},
+	{
+		.name = "s390",
+		.objdump =  {
+			.comment_char = '#',
+		},
+	},
 };
 
 static void ins__delete(struct ins_operands *ops)

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/perf-annotate-s390-implement-jump-types-for-perf-annotate.patch queue-4.10/perf-annotate-s390-fix-perf-annotate-error-95-4.10-regression.patch