| author | Andy Lutomirski <luto@kernel.org> | 2016-12-16 16:33:45 (GMT) |
|---|---|---|
| committer | Chenbo Feng <fengc@google.com> | 2017-05-22 22:30:59 (GMT) |
| commit | cde30d1a2b30db834f80b6c7812e1ec53fc52ffc (patch) | |
| tree | 2205da1cfbee82bc71aa89e27ec50bb8955f5033 | |
| parent | c00662a5879a2cf9413079dfbcbc2ee7f62ea2a8 (diff) | |
| download | common-cde30d1a2b30db834f80b6c7812e1ec53fc52ffc.zip common-cde30d1a2b30db834f80b6c7812e1ec53fc52ffc.tar.gz common-cde30d1a2b30db834f80b6c7812e1ec53fc52ffc.tar.bz2 | |
UPSTREAM: cgroup: Fix CGROUP_BPF config
Cherry-pick from commit 483c4933ea09b7aa625b9d64af286fc22ec7e419
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>
Bug: 30950746
Change-Id: Ib41ef78fba02eb9e592558ddbf06f9ec0aa337b6
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 8d60e29..95270dd 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1241,7 +1241,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. |