diff options
Diffstat (limited to 'target/linux/brcm2708/patches-3.14/0027-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-3.14/0027-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/target/linux/brcm2708/patches-3.14/0027-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-3.14/0027-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch deleted file mode 100644 index e97afa3d5b..0000000000 --- a/target/linux/brcm2708/patches-3.14/0027-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6f2dc468edc31cf2c9b2098566cbbcc1e59b5ad5 Mon Sep 17 00:00:00 2001 -From: popcornmix <popcornmix@gmail.com> -Date: Wed, 18 Dec 2013 22:16:19 +0000 -Subject: [PATCH 27/54] 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 | 27 +++++++++++++++++++++++++++ - mm/memcontrol.c | 1 + - 3 files changed, 29 insertions(+) - ---- 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 ---- a/kernel/cgroup.c -+++ b/kernel/cgroup.c -@@ -5251,6 +5251,33 @@ static int __init cgroup_disable(char *s - } - __setup("cgroup_disable=", cgroup_disable); - -+static int __init cgroup_enable(char *str) -+{ -+ struct cgroup_subsys *ss; -+ char *token; -+ int i; -+ -+ while ((token = strsep(&str, ",")) != NULL) { -+ if (!*token) -+ continue; -+ -+ /* -+ * cgroup_disable, being at boot time, can't know about -+ * module subsystems, so we don't worry about them. -+ */ -+ for_each_builtin_subsys(ss, i) { -+ if (!strcmp(token, ss->name)) { -+ ss->disabled = 0; -+ printk(KERN_INFO "Disabling %s control group" -+ " subsystem\n", ss->name); -+ break; -+ } -+ } -+ } -+ return 1; -+} -+__setup("cgroup_enable=", cgroup_enable); -+ - /** - * css_from_dir - get corresponding css from the dentry of a cgroup dir - * @dentry: directory dentry of interest ---- a/mm/memcontrol.c -+++ b/mm/memcontrol.c -@@ -7316,6 +7316,7 @@ struct cgroup_subsys mem_cgroup_subsys = - .bind = mem_cgroup_bind, - .base_cftypes = mem_cgroup_files, - .early_init = 0, -+ .disabled = 1, - }; - - #ifdef CONFIG_MEMCG_SWAP |