diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-10 13:08:06 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-11 09:47:10 -0500 |
| commit | 73b351473547e543e9c8166dd67fd99c64c15b0b (patch) | |
| tree | 4cdca34900357015c050f30992268732c7915119 | |
| parent | 7cfd5fd5a9813f1430290d20c0fead9b4582a307 (diff) | |
| download | linux-73b351473547e543e9c8166dd67fd99c64c15b0b.tar.gz | |
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: 483c4933ea09 ("cgroup: Fix CGROUP_BPF config")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | init/Kconfig | 4 | ||||
| -rw-r--r-- | net/Kconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 223b734abccd..e1a937348a3e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1176,6 +1176,10 @@ config CGROUP_DEBUG Say N. +config SOCK_CGROUP_DATA + bool + default n + endif # CGROUPS config CHECKPOINT_RESTORE diff --git a/net/Kconfig b/net/Kconfig index a1005007224c..a29bb4b41c50 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -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 |