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

[Maximilian Attems]

Author: maks
Date: Wed May 11 11:40:12 2011
New Revision: 17389

Log:
topconfig enable memory cgroup

upstream worked reducing overhaed for example: 569b846d and cdec2e42

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	Wed May 11 10:08:59 2011	(r17388)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May 11 11:40:12 2011	(r17389)
@@ -5,6 +5,8 @@
     MEDIA_CONTROLLER, DVB_USB_TECHNISAT_USB2, USB_GSPCA_NW80X,
     USB_GSPCA_VICAM, XEN_WDT.
   * [x86] Enable modular XEN_NETDEV_BACKEND.
+  * topconfig enable mem cgroup RESOURCE_COUNTERS, CGROUP_MEM_RES_CTLR.
+    (closes: #534964)
 
  -- maximilian attems <maks at debian.org>  Tue, 10 May 2011 23:24:26 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed May 11 10:08:59 2011	(r17388)
+++ dists/trunk/linux-2.6/debian/config/config	Wed May 11 11:40:12 2011	(r17389)
@@ -3405,7 +3405,8 @@
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
-# CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set