| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-10 12:08:06 (GMT) |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-05-31 00:27:27 (GMT) |
| commit | a2adc7c5237b36a67f4eee71c3cde9a718a1983f (patch) | |
| tree | 3f7e3c0b536157258a87373cae80b10ea4354ce1 | |
| parent | dd133231941b3acb34bd01626ed4bc7b1b71d0d9 (diff) | |
| download | common-a2adc7c5237b36a67f4eee71c3cde9a718a1983f.zip common-a2adc7c5237b36a67f4eee71c3cde9a718a1983f.tar.gz common-a2adc7c5237b36a67f4eee71c3cde9a718a1983f.tar.bz2 | |
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>
| -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 95270dd..3bb5824 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1261,6 +1261,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 1870b35..28071fc 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -264,10 +264,6 @@ config XPS config HWBM bool -config SOCK_CGROUP_DATA - bool - default n - config CGROUP_NET_PRIO bool "Network priority cgroup" depends on CGROUPS |