From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbcHPSQb (ORCPT ); Tue, 16 Aug 2016 14:16:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38636 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753185AbcHPSQ2 (ORCPT ); Tue, 16 Aug 2016 14:16:28 -0400 Date: Tue, 16 Aug 2016 11:14:07 -0700 From: tip-bot for Ravi Bangoria Message-ID: Cc: bsingharora@gmail.com, peterz@infradead.org, hpa@zytor.com, ravi.bangoria@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, acme@redhat.com, wangnan0@huawei.com, anton@samba.org, namhyung@kernel.org, mhiramat@kernel.org, naveen.n.rao@linux.vnet.ibm.com, ananth@in.ibm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, ananth@in.ibm.com, naveen.n.rao@linux.vnet.ibm.com, namhyung@kernel.org, mhiramat@kernel.org, anton@samba.org, wangnan0@huawei.com, acme@redhat.com, alexander.shishkin@linux.intel.com, ravi.bangoria@linux.vnet.ibm.com, hpa@zytor.com, peterz@infradead.org, bsingharora@gmail.com In-Reply-To: <57ABFF88.8030905@linux.vnet.ibm.com> References: <57ABFF88.8030905@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf ppc64le: Fix build failure when libelf is not present Git-Commit-ID: f046f3df665361d2f89e660f8c79ba164069f02a 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: f046f3df665361d2f89e660f8c79ba164069f02a Gitweb: http://git.kernel.org/tip/f046f3df665361d2f89e660f8c79ba164069f02a Author: Ravi Bangoria AuthorDate: Thu, 11 Aug 2016 14:43:59 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 12 Aug 2016 14:39:48 -0300 perf ppc64le: Fix build failure when libelf is not present arch__post_process_probe_trace_events() calls get_target_map() to prepare symbol table. get_target_map() is defined inside util/probe-event.c. probe-event.c will only get included in perf binary if CONFIG_LIBELF is set. Hence arch__post_process_probe_trace_events() needs to be defined inside #ifdef HAVE_LIBELF_SUPPORT to solve compilation error. Reported-and-Tested-by: Anton Blanchard Tested-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Alexander Shishkin Cc: Balbir Singh Cc: Naveen N. Rao Cc: Ananth N Mavinakayanahalli Cc: Masami Hiramatsu Cc: Wang Nan Cc: Namhyung Kim Link: http://lkml.kernel.org/r/57ABFF88.8030905@linux.vnet.ibm.com [ Thunderbird MUA mangled it, fix that ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/powerpc/util/sym-handling.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/arch/powerpc/util/sym-handling.c b/tools/perf/arch/powerpc/util/sym-handling.c index 8d4dc97..35745a7 100644 --- a/tools/perf/arch/powerpc/util/sym-handling.c +++ b/tools/perf/arch/powerpc/util/sym-handling.c @@ -97,6 +97,7 @@ void arch__fix_tev_from_maps(struct perf_probe_event *pev, } } +#ifdef HAVE_LIBELF_SUPPORT void arch__post_process_probe_trace_events(struct perf_probe_event *pev, int ntevs) { @@ -118,5 +119,6 @@ void arch__post_process_probe_trace_events(struct perf_probe_event *pev, } } } +#endif /* HAVE_LIBELF_SUPPORT */ #endif