From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752807AbbIRFtg (ORCPT ); Fri, 18 Sep 2015 01:49:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43009 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752375AbbIRFte (ORCPT ); Fri, 18 Sep 2015 01:49:34 -0400 Date: Thu, 17 Sep 2015 22:48:50 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, wangnan0@huawei.com, vlee@twopensource.com, linux-kernel@vger.kernel.org, bp@suse.de, dsahern@gmail.com, srikar@linux.vnet.ibm.com, fweisbec@gmail.com, a.p.zijlstra@chello.nl, adrian.hunter@intel.com, acme@redhat.com, victor.kamensky@linaro.org, namhyung@kernel.org, jolsa@kernel.org, eranian@google.com, naveen.n.rao@linux.vnet.ibm.com Reply-To: vlee@twopensource.com, linux-kernel@vger.kernel.org, bp@suse.de, hpa@zytor.com, wangnan0@huawei.com, tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, victor.kamensky@linaro.org, naveen.n.rao@linux.vnet.ibm.com, jolsa@kernel.org, eranian@google.com, fweisbec@gmail.com, srikar@linux.vnet.ibm.com, dsahern@gmail.com, acme@redhat.com, adrian.hunter@intel.com, a.p.zijlstra@chello.nl To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] Revert "perf symbols: Fix mismatched declarations for elf_getphdrnum" Git-Commit-ID: 179f36dde3cec0f9f05a757b68f6a58e4edbcc95 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: 179f36dde3cec0f9f05a757b68f6a58e4edbcc95 Gitweb: http://git.kernel.org/tip/179f36dde3cec0f9f05a757b68f6a58e4edbcc95 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 17 Sep 2015 11:30:20 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 17 Sep 2015 13:10:05 -0300 Revert "perf symbols: Fix mismatched declarations for elf_getphdrnum" This reverts commit f785f2357673d520a0b7b468973cdd197f336494. We have a test to check if elf_getphdrnum() is present, so, if it fails, we'll get: [acme@rhel5 linux]$ cat /tmp/build/perf/feature/test-libelf-getphdrnum.make.output cc1: warnings being treated as errors test-libelf-getphdrnum.c: In function ‘main’: test-libelf-getphdrnum.c:7: warning: implicit declaration of function ‘elf_getphdrnum’ [acme@rhel5 linux]$ And this block will not be compiled: #ifndef HAVE_ELF_GETPHDRNUM_SUPPORT static int elf_getphdrnum(Elf *elf, size_t *dst) ... #endif So, if elf_getphdrnum() is being defined somewhere, there is a problem with the test that is not detecting that function, go fix it. Reported-by: Vinson Lee Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: "Naveen N. Rao" Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Stephane Eranian Cc: Victor Kamensky Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-qn459fal6acvcvm50i8zxx9k@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 53bb5f5..f78ea3d 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -38,7 +38,7 @@ static inline char *bfd_demangle(void __maybe_unused *v, #endif #ifndef HAVE_ELF_GETPHDRNUM_SUPPORT -int elf_getphdrnum(Elf *elf, size_t *dst) +static int elf_getphdrnum(Elf *elf, size_t *dst) { GElf_Ehdr gehdr; GElf_Ehdr *ehdr;