aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-09-22 19:38:19 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-09-22 23:12:37 +0200
commit4f6837180e9aca525b107891e5f53373dc802038 (patch)
tree6588c431ece4d1b0186402fae3ff3f17d37c5799 /target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
parent0082e90e4f7ed2814065239a9d57d06cfbda0993 (diff)
downloadupstream-4f6837180e9aca525b107891e5f53373dc802038.tar.gz
upstream-4f6837180e9aca525b107891e5f53373dc802038.tar.bz2
upstream-4f6837180e9aca525b107891e5f53373dc802038.zip
kernel: Update to version 4.4.194
Compile and runtime tested on lantiq. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
index ecc58f5814..6af5de4bb8 100644
--- a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
+++ b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5315,7 +5315,7 @@ int __init cgroup_init_early(void)
+@@ -5321,7 +5321,7 @@ int __init cgroup_init_early(void)
return 0;
}
@@ -19,7 +19,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to
/**
* cgroup_init - cgroup initialization
-@@ -5811,6 +5811,27 @@ static int __init cgroup_disable(char *s
+@@ -5817,6 +5817,27 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);