summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-06 09:52:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-06 09:52:09 -0700
commit9ced560b82606b35adb33a27012a148d418a4c1f (patch)
tree7f02be0aeab9ed48a0fd94e53a96d08f0551464e /init
parent109a5db5042c035ded330b948a710b9a0c20934d (diff)
parent5136f6365ce3eace5a926e10f16ed2a233db5ba9 (diff)
downloadlinux-stable-9ced560b82606b35adb33a27012a148d418a4c1f.tar.gz
linux-stable-9ced560b82606b35adb33a27012a148d418a4c1f.tar.bz2
linux-stable-9ced560b82606b35adb33a27012a148d418a4c1f.zip
Merge branch 'for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup changes from Tejun Heo: - Waiman made the debug controller work and a lot more useful on cgroup2 - There were a couple issues with cgroup subtree delegation. The documentation on delegating to a non-root user was missing some part and cgroup namespace support wasn't factoring in delegation at all. The documentation is updated and the now there is a mount option to make cgroup namespace fit for delegation * 'for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: implement "nsdelegate" mount option cgroup: restructure cgroup_procs_write_permission() cgroup: "cgroup.subtree_control" should be writeable by delegatee cgroup: fix lockdep warning in debug controller cgroup: refactor cgroup_masks_read() in the debug controller cgroup: make debug an implicit controller on cgroup2 cgroup: Make debug cgroup support v2 and thread mode cgroup: Make Kconfig prompt of debug cgroup more accurate cgroup: Move debug cgroup to its own file cgroup: Keep accurate count of tasks in each css_set
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index ee0f03b69d11..b0fcbb2c6f56 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -859,11 +859,14 @@ config CGROUP_BPF
inet sockets.
config CGROUP_DEBUG
- bool "Example controller"
+ bool "Debug controller"
default n
+ depends on DEBUG_KERNEL
help
This option enables a simple controller that exports
- debugging information about the cgroups framework.
+ debugging information about the cgroups framework. This
+ controller is for control cgroup debugging only. Its
+ interfaces are not stable.
Say N.