Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / kernel / trace / trace_uprobe.c

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 1f5351c..88ba5b4 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -1343,6 +1343,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
        int size, esize;
        int rctx;
 
+#ifdef CONFIG_BPF_EVENTS
        if (bpf_prog_array_valid(call)) {
                u32 ret;
 
@@ -1350,6 +1351,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
                if (!ret)
                        return;
        }
+#endif /* CONFIG_BPF_EVENTS */
 
        esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));