[kernel] r19424 - in dists/trunk/linux/debian: config patches/features/all

[Ben Hutchings]

Author: benh
Date: Tue Oct  9 05:34:32 2012
New Revision: 19424

Log:
Finish handling renaming of CGROUP_MEM_RES_CTLR* to MEMCG*

Modified:
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Tue Oct  9 05:25:17 2012	(r19423)
+++ dists/trunk/linux/debian/config/config	Tue Oct  9 05:34:32 2012	(r19424)
@@ -3766,6 +3766,11 @@
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_DISABLED=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+# CONFIG_MEMCG_KMEM is not set
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -4807,11 +4812,6 @@
 # CONFIG_BATTERY_BQ20Z75 is not set
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_DISABLED=y
-# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
 CONFIG_DISPLAY_SUPPORT=m
 # CONFIG_DM_DEBUG_SPACE_MAPS is not set
 # CONFIG_ECONET is not set

Modified: dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch	Tue Oct  9 05:25:17 2012	(r19423)
+++ dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch	Tue Oct  9 05:34:32 2012	(r19424)
@@ -9,6 +9,7 @@
 parameter 'cgroup_enable' as the opposite to 'cgroup_disable'.
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+[Bastian Blank: Rename CGROUP_MEM_RES_CTLR_DISABLED to MEMCG_DISABLED]
 ---
  Documentation/kernel-parameters.txt |    4 ++--
  init/Kconfig                        |    8 ++++++++
@@ -96,7 +97,7 @@
  
  struct cgroup_subsys mem_cgroup_subsys = {
  	.name = "memory",
-+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_DISABLED
++#ifdef CONFIG_MEMCG_DISABLED
 +	.disabled = 1,
 +#endif
  	.subsys_id = mem_cgroup_subsys_id,