summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2016-12-16 08:33:45 -0800
committerDavid S. Miller <davem@davemloft.net>2016-12-17 21:42:45 -0500
commit483c4933ea09b7aa625b9d64af286fc22ec7e419 (patch)
tree26be0741c7daabd2e3d7f10a10f525c41702ce14 /init
parent67a72a58913ab0f2f239e771547a58987c266960 (diff)
downloadlinux-stable-483c4933ea09b7aa625b9d64af286fc22ec7e419.tar.gz
linux-stable-483c4933ea09b7aa625b9d64af286fc22ec7e419.tar.bz2
linux-stable-483c4933ea09b7aa625b9d64af286fc22ec7e419.zip
cgroup: Fix CGROUP_BPF config
CGROUP_BPF depended on SOCK_CGROUP_DATA which can't be manually enabled, making it rather challenging to turn CGROUP_BPF on. Signed-off-by: Andy Lutomirski <luto@kernel.org> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 405120b5f13e..951102707007 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1156,7 +1156,8 @@ config CGROUP_PERF
config CGROUP_BPF
bool "Support for eBPF programs attached to cgroups"
- depends on BPF_SYSCALL && SOCK_CGROUP_DATA
+ depends on BPF_SYSCALL
+ select SOCK_CGROUP_DATA
help
Allow attaching eBPF programs to a cgroup using the bpf(2)
syscall command BPF_PROG_ATTACH.