Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935107AbdDSOip (ORCPT ); Wed, 19 Apr 2017 10:38:45 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45216 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764613AbdDSOij (ORCPT ); Wed, 19 Apr 2017 10:38:39 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christian Borntraeger , Andreas Krebbel , Hendrik Brueckner , Martin Schwidefsky , Peter Zijlstra , linux-s390 , Arnaldo Carvalho de Melo Subject: [PATCH 4.10 20/69] perf annotate s390: Fix perf annotate error -95 (4.10 regression) Date: Wed, 19 Apr 2017 16:36:49 +0200 Message-Id: <20170419141555.950398919@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170419141555.114738231@linuxfoundation.org> References: <20170419141555.114738231@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1583 Lines: 47 4.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Borntraeger commit 3c1a427954399fd1bda1ee7e1b356f47b61cee74 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. Signed-off-by: Christian Borntraeger Cc: Andreas Krebbel Cc: Hendrik Brueckner Cc: Martin Schwidefsky Cc: Peter Zijlstra Cc: linux-s390 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 Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/annotate.c | 6 ++++++ 1 file changed, 6 insertions(+) --- 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)