aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init/Kconfig4
-rw-r--r--net/Kconfig4
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
1176 1176
1177 Say N. 1177 Say N.
1178 1178
1179config SOCK_CGROUP_DATA
1180 bool
1181 default n
1182
1179endif # CGROUPS 1183endif # CGROUPS
1180 1184
1181config CHECKPOINT_RESTORE 1185config 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
258config HWBM 258config HWBM
259 bool 259 bool
260 260
261config SOCK_CGROUP_DATA
262 bool
263 default n
264
265config CGROUP_NET_PRIO 261config CGROUP_NET_PRIO
266 bool "Network priority cgroup" 262 bool "Network priority cgroup"
267 depends on CGROUPS 263 depends on CGROUPS