---

yaml --- r: 208518 b: refs/heads/master c: 65e0e81 h: refs/heads/master v: v3
git-mirror · Aug 11, 2010 · 7577ac1 · 7577ac1
1 parent 6e602f7
commit 7577ac1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,