Commit 73b35147 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

cgroup: move CONFIG_SOCK_CGROUP_DATA to init/Kconfig

We now 'select SOCK_CGROUP_DATA' but Kconfig complains that this is
not right when CONFIG_NET is disabled and there is no socket interface:

warning: (CGROUP_BPF) selects SOCK_CGROUP_DATA which has unmet direct dependencies (NET)

I don't know what the correct solution for this is, but simply removing
the dependency on NET from SOCK_CGROUP_DATA by moving it out of the
'if NET' section avoids the warning and does not produce other build
errors.

Fixes: 483c4933

 ("cgroup: Fix CGROUP_BPF config")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cfd5fd5
......@@ -1176,6 +1176,10 @@ config CGROUP_DEBUG
Say N.
config SOCK_CGROUP_DATA
bool
default n
endif # CGROUPS
config CHECKPOINT_RESTORE
......
......@@ -258,10 +258,6 @@ config XPS
config HWBM
bool
config SOCK_CGROUP_DATA
bool
default n
config CGROUP_NET_PRIO
bool "Network priority cgroup"
depends on CGROUPS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment