diff options
| author |   Alexei Starovoitov <ast@plumgrid.com> | 2015-10-23 14:58:19 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-26 21:53:34 -0700 |
| commit | 1075ef5950da97927ae1b3ef76d03e211c4fdb55 (patch) | |
| tree | 1d09bdae760e16777b9ba81a126bde5a93c83151 /kernel/trace | |
| parent | bpf: fix bpf_perf_event_read() helper (diff) | |
| download | linux-dev-1075ef5950da97927ae1b3ef76d03e211c4fdb55.tar.xz linux-dev-1075ef5950da97927ae1b3ef76d03e211c4fdb55.zip | |
bpf: make tracing helpers gpl only
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>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 003df3887287..4228fd3682c3 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -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, |