diff --git a/[refs] b/[refs] index 0fee4cdf9dda..1c94b3d53d2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7300b78d1a87625975a799a109a2f98d77757c8 +refs/heads/master: 65e0e811667dedd4f19b268df9d856ecacb629de diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 24932b9c03e8..2de5b1cbadd9 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -577,8 +577,8 @@ config CGROUP_MEM_RES_CTLR could in turn add some fork/exit overhead. config CGROUP_MEM_RES_CTLR_SWAP - bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)" - depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL + bool "Memory Resource Controller Swap Extension" + depends on CGROUP_MEM_RES_CTLR && SWAP help Add swap management feature to memory resource controller. When you enable this, you can limit mem+swap usage per cgroup. In other words,