cgroups: Enable CGROUP_MEM_RES_CTLR_SWAP but not CGROUP_MEM_RES_CTLR_SWAP_ENABLED

svn path=/dists/trunk/linux-2.6/; revision=17486
This commit is contained in:
Ben Hutchings 2011-05-30 19:49:43 +00:00
parent 10b4bfc49b
commit ae476a8b88
2 changed files with 5 additions and 0 deletions

3
debian/changelog vendored
View File

@ -11,6 +11,9 @@ linux-2.6 (3.0~rc1-1~experimental.1) UNRELEASED; urgency=low
Linksys WUSB600N (Closes: #596626) (this change was accidentally
omitted from 2.6.39-1)
* fs: Enable FHANDLE
* cgroups: Enable CGROUP_MEM_RES_CTLR_SWAP but not
CGROUP_MEM_RES_CTLR_SWAP_ENABLED. Swap accounting can be enabled
using kernel parameter 'swapaccount'.
-- Ben Hutchings <ben@decadent.org.uk> Sat, 21 May 2011 22:13:08 +0100

View File

@ -3407,6 +3407,8 @@ CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
CONFIG_CGROUP_MEM_RES_CTLR_DISABLED=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set