Commit 73b35147 authored Jan 10, 2017 by Arnd Bergmann Committed by David S. Miller Jan 11, 2017

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7cfd5fd5

init/Kconfig

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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

net/Kconfig

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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