diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 19:25:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 19:25:52 +0200 |
| commit | b9271f0c65e12efd9b6319f57a378aac1be98b22 (patch) | |
| tree | 923cd44cd4e1568d3abf2b8d69b4a4712e01f8ef /kernel/bpf/core.c | |
| parent | a3664a74a0aa0b11d8d4ade04984965b77d14d44 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into perf/core, to refresh branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/core.c')
| -rw-r--r-- | kernel/bpf/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 7c473f208a105..080e2bb644ccd 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2097,7 +2097,6 @@ int __weak skb_copy_bits(const struct sk_buff *skb, int offset, void *to, DEFINE_STATIC_KEY_FALSE(bpf_stats_enabled_key); EXPORT_SYMBOL(bpf_stats_enabled_key); -int sysctl_bpf_stats_enabled __read_mostly; /* All definitions of tracepoints related to BPF. */ #define CREATE_TRACE_POINTS |