diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-12 10:32:59 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-14 18:24:11 +0200 |
commit | bc138c5b72305ea977573e30bc8d8a5b32c094f9 (patch) | |
tree | 8ee98905f65d077a4abd48f9ca5b7dd309d765db /target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch | |
parent | 46e9a9b04e4f42772cac056453a77937a2b6a40c (diff) | |
download | upstream-bc138c5b72305ea977573e30bc8d8a5b32c094f9.tar.gz upstream-bc138c5b72305ea977573e30bc8d8a5b32c094f9.tar.bz2 upstream-bc138c5b72305ea977573e30bc8d8a5b32c094f9.zip |
kernel: bump 4.14 to 4.14.138
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 e231841d88..fa0ebffb27 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 <phil@raspberrypi.org> --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5168,6 +5168,8 @@ int __init cgroup_init_early(void) +@@ -5206,6 +5206,8 @@ int __init cgroup_init_early(void) } static u16 cgroup_disable_mask __initdata; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /** * cgroup_init - cgroup initialization -@@ -5206,6 +5208,12 @@ int __init cgroup_init(void) +@@ -5244,6 +5246,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -5589,6 +5597,28 @@ static int __init cgroup_disable(char *s +@@ -5635,6 +5643,28 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); |