1 files changed, 0 insertions, 81 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0128-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-3.10/0128-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
deleted file mode 100644
index e231f6540f..0000000000
--- a/target/linux/brcm2708/patches-3.10/0128-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 10e9081e9311264f34259527c8d08a8c95beb2da Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 18 Dec 2013 22:16:19 +0000
-Subject: [PATCH 128/196] config: Enable CONFIG_MEMCG, but leave it disabled
- (due to memory cost). Enable with cgroup_enable=memory.
-
----
- arch/arm/configs/bcmrpi_defconfig |  1 +
- kernel/cgroup.c                   | 31 +++++++++++++++++++++++++++++++
- mm/memcontrol.c                   |  1 +
- 3 files changed, 33 insertions(+)
-
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 31010e4..fd3229a 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -18,6 +18,7 @@ CONFIG_CGROUP_FREEZER=y
- CONFIG_CGROUP_DEVICE=y
- CONFIG_CGROUP_CPUACCT=y
- CONFIG_RESOURCE_COUNTERS=y
-+CONFIG_MEMCG=y
- CONFIG_BLK_CGROUP=y
- CONFIG_NAMESPACES=y
- CONFIG_SCHED_AUTOGROUP=y
-diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index d0def7f..de9d91a 100644
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
-@@ -5127,6 +5127,37 @@ static int __init cgroup_disable(char *str)
- }
- __setup("cgroup_disable=", cgroup_disable);
- 
-+static int __init cgroup_enable(char *str)
-+{
-+	int i;
-+	char *token;
-+
-+	while ((token = strsep(&str, ",")) != NULL) {
-+		if (!*token)
-+			continue;
-+		for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
-+			struct cgroup_subsys *ss = subsys[i];
-+
-+			/*
-+			 * cgroup_enable, being at boot time, can't
-+			 * know about module subsystems, so we don't
-+			 * worry about them.
-+			 */
-+			if (!ss || ss->module)
-+				continue;
-+
-+			if (!strcmp(token, ss->name)) {
-+				ss->disabled = 0;
-+				printk(KERN_INFO "Enabling %s control group"
-+					" subsystem\n", ss->name);
-+				break;
-+			}
-+		}
-+	}
-+	return 1;
-+}
-+__setup("cgroup_enable=", cgroup_enable);
-+
- /*
-  * Functons for CSS ID.
-  */
-diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index f45e21a..28a7e40 100644
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
-@@ -6970,6 +6970,7 @@ struct cgroup_subsys mem_cgroup_subsys = {
- 	.base_cftypes = mem_cgroup_files,
- 	.early_init = 0,
- 	.use_id = 1,
-+	.disabled = 1,
- };
- 
- #ifdef CONFIG_MEMCG_SWAP
--- 
-1.9.1
-