hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: 483c4933ea ("cgroup: Fix CGROUP_BPF config")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2017-01-10 13:08:06 +01:00 committed by David S. Miller
parent 7cfd5fd5a9
commit 73b3514735
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/Kconfig
View File

@ -1176,6 +1176,10 @@ config CGROUP_DEBUG
Say N. Say N.
config SOCK_CGROUP_DATA
bool
default n
endif # CGROUPS endif # CGROUPS
config CHECKPOINT_RESTORE config CHECKPOINT_RESTORE

4
net/Kconfig
View File

@ -258,10 +258,6 @@ config XPS
config HWBM config HWBM
bool bool
config SOCK_CGROUP_DATA
bool
default n
config CGROUP_NET_PRIO config CGROUP_NET_PRIO
bool "Network priority cgroup" bool "Network priority cgroup"
depends on CGROUPS depends on CGROUPS