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>

diff --git a/init/Kconfig b/init/Kconfig
index 405120b5f13e843caeb70cf87ee70458bc2746dd..95110270700748eb1e9f3b53a7ceb4c9b016f109 100644 (file)
--- 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.