]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
bpf: make tracing helpers gpl only
authorAlexei Starovoitov <ast@plumgrid.com>
Fri, 23 Oct 2015 21:58:19 +0000 (14:58 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Oct 2015 04:53:34 +0000 (21:53 -0700)
exported perf symbols are GPL only, mark eBPF helper functions
used in tracing as GPL only as well.

Suggested-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
kernel/trace/bpf_trace.c

index 003df388728739b4e2ac51e522fad44210859443..4228fd3682c3d45894f0f3bbc13a715331a24e7c 100644 (file)
@@ -214,7 +214,7 @@ static u64 bpf_perf_event_read(u64 r1, u64 index, u64 r3, u64 r4, u64 r5)
 
 static const struct bpf_func_proto bpf_perf_event_read_proto = {
        .func           = bpf_perf_event_read,
-       .gpl_only       = false,
+       .gpl_only       = true,
        .ret_type       = RET_INTEGER,
        .arg1_type      = ARG_CONST_MAP_PTR,
        .arg2_type      = ARG_ANYTHING,
@@ -255,7 +255,7 @@ static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 index, u64 r4, u64 size)
 
 static const struct bpf_func_proto bpf_perf_event_output_proto = {
        .func           = bpf_perf_event_output,
-       .gpl_only       = false,
+       .gpl_only       = true,
        .ret_type       = RET_INTEGER,
        .arg1_type      = ARG_PTR_TO_CTX,
        .arg2_type      = ARG_CONST_MAP_PTR,