diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-06-03 19:00:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-06-03 19:00:49 +0200 |
| commit | a9e906b71f963f19aabf7af59f73f37c929a5221 (patch) | |
| tree | 0228f82f4719160cfa4635c0c042c9c73fc2d2a5 /kernel/bpf/syscall.c | |
| parent | 475ea6c60279e9f2ddf7e4cf2648cd8ae0608361 (diff) | |
| parent | fcf6631f3736985ec89bdd76392d3c7bfb60119f (diff) | |
| download | linux-a9e906b71f963f19aabf7af59f73f37c929a5221.tar.gz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/syscall.c')
| -rw-r--r-- | kernel/bpf/syscall.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 941ca06d9dfa..ea04b0deb5ce 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -50,7 +50,8 @@ static DEFINE_SPINLOCK(map_idr_lock); static DEFINE_IDR(link_idr); static DEFINE_SPINLOCK(link_idr_lock); -int sysctl_unprivileged_bpf_disabled __read_mostly; +int sysctl_unprivileged_bpf_disabled __read_mostly = + IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; static const struct bpf_map_ops * const bpf_map_types[] = { #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type) |