From 794771afde99814b00485f335553d7203874eaea Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 3 Jun 2019 13:40:15 +0200 Subject: kernel: bump 4.14 to 4.14.123 Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../950-0136-cgroup-Disable-cgroup-memory-by-default.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch') diff --git a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch index eb85fe6439..e231841d88 100644 --- a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5162,6 +5162,8 @@ int __init cgroup_init_early(void) +@@ -5168,6 +5168,8 @@ int __init cgroup_init_early(void) } static u16 cgroup_disable_mask __initdata; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell /** * cgroup_init - cgroup initialization -@@ -5200,6 +5202,12 @@ int __init cgroup_init(void) +@@ -5206,6 +5208,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -5583,6 +5591,28 @@ static int __init cgroup_disable(char *s +@@ -5589,6 +5597,28 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); -- cgit v1.2.3