linux-kernel - [tip:perf/urgent] perf ppc64le: Fix build failure when libelf is not present

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-f046f3df665361d2f89e660f8c79ba164069f02a@git.kernel.org>
Date:	Tue, 16 Aug 2016 11:14:07 -0700
From:	tip-bot for Ravi Bangoria <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	bsingharora@...il.com, peterz@...radead.org, hpa@...or.com,
	ravi.bangoria@...ux.vnet.ibm.com,
	alexander.shishkin@...ux.intel.com, acme@...hat.com,
	wangnan0@...wei.com, anton@...ba.org, namhyung@...nel.org,
	mhiramat@...nel.org, naveen.n.rao@...ux.vnet.ibm.com,
	ananth@...ibm.com, tglx@...utronix.de,
	linux-kernel@...r.kernel.org, mingo@...nel.org
Subject: [tip:perf/urgent] perf ppc64le: Fix build failure when libelf is
 not present

Commit-ID:  f046f3df665361d2f89e660f8c79ba164069f02a
Gitweb:     http://git.kernel.org/tip/f046f3df665361d2f89e660f8c79ba164069f02a
Author:     Ravi Bangoria <ravi.bangoria@...ux.vnet.ibm.com>
AuthorDate: Thu, 11 Aug 2016 14:43:59 -0300
Committer:  Arnaldo Carvalho de Melo <acme@...hat.com>
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 <anton@...ba.org>
Tested-by: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Balbir Singh <bsingharora@...il.com>
Cc: Naveen N. Rao <naveen.n.rao@...ux.vnet.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@...ibm.com>
Cc: Masami Hiramatsu <mhiramat@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Cc: Namhyung Kim <namhyung@...nel.org>
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 <acme@...hat.com>
---
 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