summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-26 10:15:29 -0500
committerKyle McMartin <kyle@mcmartin.ca>2010-11-26 10:15:29 -0500
commit2f05b4a2c9603413e1b3832b758d132a24929ec1 (patch)
tree35f57ed267b4034d42069ec437d07a9a8f4c0e18 /config-generic
parentc3e06ee55aad889b162aa78277b521445347cc75 (diff)
downloadkernel-2f05b4a2c9603413e1b3832b758d132a24929ec1.tar.gz
kernel-2f05b4a2c9603413e1b3832b758d132a24929ec1.tar.xz
kernel-2f05b4a2c9603413e1b3832b758d132a24929ec1.zip
Linux 2.6.37-rc3-git2
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 5b6b2912d..db67c5026 100644
--- a/config-generic
+++ b/config-generic
@@ -3810,7 +3810,8 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount'
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set