[kernel] r17486 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Mon May 30 19:49:43 2011
New Revision: 17486

Log:
cgroups: Enable CGROUP_MEM_RES_CTLR_SWAP but not CGROUP_MEM_RES_CTLR_SWAP_ENABLED

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 30 19:46:41 2011	(r17485)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 19:49:43 2011	(r17486)
@@ -11,6 +11,9 @@
     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 at decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 30 19:46:41 2011	(r17485)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 30 19:49:43 2011	(r17486)
@@ -3407,6 +3407,8 @@
 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