aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-02-15 21:54:37 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-02-16 00:46:23 +0100
commit236840eb473d271450d9864d1c46927ddaf305ee (patch)
treec9b34623da285c535cafdcd7fbc286a5f39f7462 /target/linux/brcm2708
parentd517f043434901452fd19dabc7deefb58179c444 (diff)
downloadupstream-236840eb473d271450d9864d1c46927ddaf305ee.tar.gz
upstream-236840eb473d271450d9864d1c46927ddaf305ee.tar.bz2
upstream-236840eb473d271450d9864d1c46927ddaf305ee.zip
kernel: update kernel 4.9 to version 4.9.10
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/patches-4.9/0060-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.9/0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.9/0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
index 2fb9aca792..a2eca8a994 100644
--- a/target/linux/brcm2708/patches-4.9/0060-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
+++ b/target/linux/brcm2708/patches-4.9/0060-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
-@@ -5629,7 +5629,7 @@ int __init cgroup_init_early(void)
+@@ -5626,7 +5626,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
-@@ -6166,6 +6166,28 @@ static int __init cgroup_no_v1(char *str
+@@ -6163,6 +6163,28 @@ static int __init cgroup_no_v1(char *str
}
__setup("cgroup_no_v1=", cgroup_no_v1);