From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752605AbdI2UHa (ORCPT ); Fri, 29 Sep 2017 16:07:30 -0400 Received: from terminus.zytor.com ([65.50.211.136]:56999 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752510AbdI2UH3 (ORCPT ); Fri, 29 Sep 2017 16:07:29 -0400 Date: Fri, 29 Sep 2017 13:06:18 -0700 From: tip-bot for Thomas Richter Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, brueckner@linux.vnet.ibm.com, mingo@kernel.org, tmricht@linux.vnet.ibm.com, zvonko.kosic@de.ibm.com, acme@redhat.com, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, mingo@kernel.org, brueckner@linux.vnet.ibm.com, hpa@zytor.com, tmricht@linux.vnet.ibm.com, zvonko.kosic@de.ibm.com, acme@redhat.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf test: Fix vmlinux failure on s390x part 2 Git-Commit-ID: 5357413f5c067f60933e4b8d79d483fbe62b2bb5 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: 5357413f5c067f60933e4b8d79d483fbe62b2bb5 Gitweb: https://git.kernel.org/tip/5357413f5c067f60933e4b8d79d483fbe62b2bb5 Author: Thomas Richter AuthorDate: Fri, 15 Sep 2017 09:14:04 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 28 Sep 2017 13:01:42 -0300 perf test: Fix vmlinux failure on s390x part 2 On s390x perf test 1 failed. It turned out that commit cf6383f73cf2 ("perf report: Fix kernel symbol adjustment for s390x") was incorrect. The previous implementation in dso__load_sym() is also suitable for s390x. Therefore this patch undoes commit cf6383f73cf2 Signed-off-by: Thomas-Mich Richter Cc: Zvonko Kosic Cc: Hendrik Brueckner Fixes: cf6383f73cf2 ("perf report: Fix kernel symbol adjustment for s390x") LPU-Reference: 20170915071404.58398-2-tmricht@linux.vnet.ibm.com Link: http://lkml.kernel.org/n/tip-v101o8k25vuja2ogosgf15yy@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/s390/util/Build | 1 - tools/perf/arch/s390/util/sym-handling.c | 21 --------------------- 2 files changed, 22 deletions(-) diff --git a/tools/perf/arch/s390/util/Build b/tools/perf/arch/s390/util/Build index bd518b6..5bd7b92 100644 --- a/tools/perf/arch/s390/util/Build +++ b/tools/perf/arch/s390/util/Build @@ -1,5 +1,4 @@ libperf-y += header.o -libperf-y += sym-handling.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o diff --git a/tools/perf/arch/s390/util/sym-handling.c b/tools/perf/arch/s390/util/sym-handling.c deleted file mode 100644 index 581d4c5..0000000 --- a/tools/perf/arch/s390/util/sym-handling.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Architecture specific ELF symbol handling and relocation mapping. - * - * Copyright 2017 IBM Corp. - * Author(s): Thomas Richter - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. - */ - -#include "symbol.h" - -#ifdef HAVE_LIBELF_SUPPORT -bool elf__needs_adjust_symbols(GElf_Ehdr ehdr) -{ - if (ehdr.e_type == ET_EXEC) - return false; - return ehdr.e_type == ET_REL || ehdr.e_type == ET_DYN; -} -#endif