Commit cde30d1a authored Dec 16, 2016 by Andy Lutomirski Committed by Chenbo Feng May 22, 2017

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

parent c00662a5

init/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -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.