aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorVladimir Davydov <vdavydov@parallels.com>2015-04-01 10:30:36 -0400
committerJonathan Corbet <corbet@lwn.net>2015-04-11 09:23:31 -0400
commit197175427a221fe3200f7727ea35e261727e7228 (patch)
tree4ed58a8512f9bc41908727859c6694a86466830e /init
parent82c91e87642dd6f88b9d9b1e5cc09232b6701eb0 (diff)
Documentation/memcg: update memcg/kmem status
Memcg/kmem reclaim support has been finally merged. Reflect this in the documentation. Acked-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig6
1 files changed, 0 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f5dbc6d4261b..115051093d2f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1032,12 +1032,6 @@ config MEMCG_KMEM
1032 the kmem extension can use it to guarantee that no group of processes 1032 the kmem extension can use it to guarantee that no group of processes
1033 will ever exhaust kernel resources alone. 1033 will ever exhaust kernel resources alone.
1034 1034
1035 WARNING: Current implementation lacks reclaim support. That means
1036 allocation attempts will fail when close to the limit even if there
1037 are plenty of kmem available for reclaim. That makes this option
1038 unusable in real life so DO NOT SELECT IT unless for development
1039 purposes.
1040
1041config CGROUP_HUGETLB 1035config CGROUP_HUGETLB
1042 bool "HugeTLB Resource Controller for Control Groups" 1036 bool "HugeTLB Resource Controller for Control Groups"
1043 depends on HUGETLB_PAGE 1037 depends on HUGETLB_PAGE