From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753173AbdDKTti (ORCPT ); Tue, 11 Apr 2017 15:49:38 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40959 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751900AbdDKTth (ORCPT ); Tue, 11 Apr 2017 15:49:37 -0400 Date: Tue, 11 Apr 2017 12:46:06 -0700 From: tip-bot for Christian Borntraeger Message-ID: Cc: linux-s390@vger.kernel.org, krebbel@linux.vnet.ibm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, brueckner@linux.vnet.ibm.com, schwidefsky@de.ibm.com, hpa@zytor.com, borntraeger@de.ibm.com, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, krebbel@linux.vnet.ibm.com, linux-s390@vger.kernel.org, schwidefsky@de.ibm.com, peterz@infradead.org, hpa@zytor.com, borntraeger@de.ibm.com, brueckner@linux.vnet.ibm.com In-Reply-To: <1491465112-45819-2-git-send-email-borntraeger@de.ibm.com> References: <1491465112-45819-2-git-send-email-borntraeger@de.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate s390: Fix perf annotate error -95 (4.10 regression) Git-Commit-ID: 3c1a427954399fd1bda1ee7e1b356f47b61cee74 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3c1a427954399fd1bda1ee7e1b356f47b61cee74 Gitweb: http://git.kernel.org/tip/3c1a427954399fd1bda1ee7e1b356f47b61cee74 Author: Christian Borntraeger AuthorDate: Thu, 6 Apr 2017 09:51:51 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 7 Apr 2017 12:33:10 -0300 perf annotate s390: Fix perf annotate error -95 (4.10 regression) 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. Signed-off-by: Christian Borntraeger Cc: Andreas Krebbel Cc: Hendrik Brueckner Cc: Martin Schwidefsky Cc: Peter Zijlstra Cc: linux-s390 Cc: stable@kernel.org # v4.10+ Fixes: 786c1b51844 "perf annotate: Start supporting cross arch annotation" Link: http://lkml.kernel.org/r/1491465112-45819-2-git-send-email-borntraeger@de.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 273f21f..7aa5722 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -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)