summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-06 15:10:22 +0200
committerDavid S. Miller <davem@davemloft.net>2016-09-06 16:34:14 -0700
commitf1e4ba5b6a6555d1f6b174d4fd0a96a9363bb57f (patch)
treece25127a5cf8b1ca5bda066c785fe1892a65152e /kernel
parent3f591997b1484cbf869d21b511c8d84902444cfb (diff)
downloadop-kernel-dev-f1e4ba5b6a6555d1f6b174d4fd0a96a9363bb57f.zip
op-kernel-dev-f1e4ba5b6a6555d1f6b174d4fd0a96a9363bb57f.tar.gz
perf, bpf: fix conditional call to bpf_overflow_handler
The newly added bpf_overflow_handler function is only built of both CONFIG_EVENT_TRACING and CONFIG_BPF_SYSCALL are enabled, but the caller only checks the latter: kernel/events/core.c: In function 'perf_event_alloc': kernel/events/core.c:9106:27: error: 'bpf_overflow_handler' undeclared (first use in this function) This changes the caller so we also skip this call if CONFIG_EVENT_TRACING is disabled entirely. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs") Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 85bf4c3..a7b8c1c 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -9072,7 +9072,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
if (!overflow_handler && parent_event) {
overflow_handler = parent_event->overflow_handler;
context = parent_event->overflow_handler_context;
-#ifdef CONFIG_BPF_SYSCALL
+#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_EVENT_TRACING)
if (overflow_handler == bpf_overflow_handler) {
struct bpf_prog *prog = bpf_prog_inc(parent_event->prog);
OpenPOWER on IntegriCloud