X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=init%2FKconfig;h=b8930d5a8325fc0557ddb8649e16d7c8d7c68f21;hb=1ba9ac7c35b30d6b958a30240e21ddaea8d21b35;hp=43298f9810fba87bdf0083ac1fa5401b0819c4cb;hpb=1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad;p=~andy%2Flinux

diff --git a/init/Kconfig b/init/Kconfig
index 43298f9810f..b8930d5a832 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -689,6 +689,17 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
 	  For those who want to have the feature enabled by default should
 	  select this option (if, for some reason, they need to disable it
 	  then swapaccount=0 does the trick).
+config CGROUP_MEM_RES_CTLR_KMEM
+	bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
+	depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL
+	default n
+	help
+	  The Kernel Memory extension for Memory Resource Controller can limit
+	  the amount of memory used by kernel objects in the system. Those are
+	  fundamentally different from the entities handled by the standard
+	  Memory Controller, which are page-based, and can be swapped. Users of
+	  the kmem extension can use it to guarantee that no group of processes
+	  will ever exhaust kernel resources alone.
 
 config CGROUP_PERF
 	bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"