diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-13 07:38:27 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-13 07:38:27 +0000 |
| commit | 50a4aa688be2e05464d250686df0d4272b3c8c17 (patch) | |
| tree | 2b2acdd9795e115eaece266c0323367885de17bd /target/linux/brcm2708/patches-3.18/0024-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch | |
| parent | db3443e8953c04280ecfefba9b36aed9176c4abc (diff) | |
| download | upstream-50a4aa688be2e05464d250686df0d4272b3c8c17.tar.gz upstream-50a4aa688be2e05464d250686df0d4272b3c8c17.tar.bz2 upstream-50a4aa688be2e05464d250686df0d4272b3c8c17.zip | |
brcm2708: refresh patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44433 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0024-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch')
| -rw-r--r--[-rwxr-xr-x] | target/linux/brcm2708/patches-3.18/0024-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0024-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-3.18/0024-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch index f637a436e3..e720949304 100755..100644 --- a/target/linux/brcm2708/patches-3.18/0024-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch +++ b/target/linux/brcm2708/patches-3.18/0024-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch @@ -10,8 +10,6 @@ Subject: [PATCH 024/114] config: Enable CONFIG_MEMCG, but leave it disabled mm/memcontrol.c | 1 + 3 files changed, 25 insertions(+) -diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index e2da9da..897616c 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -19,6 +19,7 @@ CONFIG_CGROUP_FREEZER=y @@ -22,11 +20,9 @@ index e2da9da..897616c 100644 CONFIG_BLK_CGROUP=y CONFIG_NAMESPACES=y CONFIG_SCHED_AUTOGROUP=y -diff --git a/kernel/cgroup.c b/kernel/cgroup.c -index 136ecea..c909506 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5322,6 +5322,29 @@ static int __init cgroup_disable(char *str) +@@ -5322,6 +5322,29 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); @@ -56,11 +52,9 @@ index 136ecea..c909506 100644 static int __init cgroup_set_legacy_files_on_dfl(char *str) { printk("cgroup: using legacy files on the default hierarchy\n"); -diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 4918b6e..168498c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -6207,6 +6207,7 @@ struct cgroup_subsys memory_cgrp_subsys = { +@@ -6207,6 +6207,7 @@ struct cgroup_subsys memory_cgrp_subsys .bind = mem_cgroup_bind, .legacy_cftypes = mem_cgroup_files, .early_init = 0, @@ -68,6 +62,3 @@ index 4918b6e..168498c 100644 }; #ifdef CONFIG_MEMCG_SWAP --- -1.8.3.2 - |