aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2010-08-10 21:02:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:18 -0400
commit65e0e811667dedd4f19b268df9d856ecacb629de (patch)
tree4a324c2e987157abd2593b7bd598d454792738d4
parentb7300b78d1a87625975a799a109a2f98d77757c8 (diff)
memcg: remove experimental from swap account config
It's 11 months since we changed swap_map[] to indicates SWAP_HAS_CACHE. Since that, memcg's swap accounting has been very stable and it seems it can be maintained. So, I'd like to remove EXPERIMENTAL from the config. Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com> Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--init/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 24932b9c03e8..2de5b1cbadd9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -577,8 +577,8 @@ config CGROUP_MEM_RES_CTLR
577 could in turn add some fork/exit overhead. 577 could in turn add some fork/exit overhead.
578 578
579config CGROUP_MEM_RES_CTLR_SWAP 579config CGROUP_MEM_RES_CTLR_SWAP
580 bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)" 580 bool "Memory Resource Controller Swap Extension"
581 depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL 581 depends on CGROUP_MEM_RES_CTLR && SWAP
582 help 582 help
583 Add swap management feature to memory resource controller. When you 583 Add swap management feature to memory resource controller. When you
584 enable this, you can limit mem+swap usage per cgroup. In other words, 584 enable this, you can limit mem+swap usage per cgroup. In other words,