diff --git a/debian/changelog b/debian/changelog index 157179d9f..963496fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ linux-2.6 (2.6.39~rc7-1~experimental.2) UNRELEASED; urgency=low 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 Tue, 10 May 2011 23:24:26 +0200 diff --git a/debian/config/config b/debian/config/config index 6d355d245..ccf4c58df 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3405,7 +3405,8 @@ CONFIG_CGROUP_DEVICE=y 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