diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-10 13:08:06 +0100 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2022-04-19 00:51:33 +0300 |
| commit | 3db01ce9d318ca6e80fff1c811be3741a333d2be (patch) | |
| tree | cccd81743efa084a4979f90a200d3cd51d55055b | |
| parent | 6126fdfff4b877750a9a0691f84216d956e2a892 (diff) | |
UPSTREAM: 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>
Fixes: Change-Id: Ib41ef78fba02eb9e592558ddbf06f9ec0aa337b6
("UPSTREAM: cgroup: Fix CGROUP_BPF config")
(cherry picked from commit 73b351473547e543e9c8166dd67fd99c64c15b0b)
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Chatur27 <jasonbright2709@gmail.com>
| -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 aca8be97c4f2..92aff8356dde 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1230,6 +1230,10 @@ config CGROUP_WRITEBACK depends on MEMCG && BLK_CGROUP default y +config SOCK_CGROUP_DATA + bool + default n + endif # CGROUPS config SCHED_HMP diff --git a/net/Kconfig b/net/Kconfig index 82e020c67a90..22fe472017fb 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -267,10 +267,6 @@ config XPS depends on SMP default y -config SOCK_CGROUP_DATA - bool - default n - config CGROUP_NET_PRIO bool "Network priority cgroup" depends on CGROUPS |