aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-12 11:52:25 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-14 18:23:08 +0200
commitc9dc0e1bdf9274581b588a82226c70a192a36556 (patch)
tree9bbabded082a4b1f47c6c222bd17ab7298421aa8 /target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch
parent873a8c50788e3b36d908e1c71502ea9332a9673d (diff)
downloadupstream-c9dc0e1bdf9274581b588a82226c70a192a36556.tar.gz
upstream-c9dc0e1bdf9274581b588a82226c70a192a36556.tar.bz2
upstream-c9dc0e1bdf9274581b588a82226c70a192a36556.zip
kernel: bump 4.19 to 4.19.66
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.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch')
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch
index 40d8ec044d..2e144548e7 100644
--- a/target/linux/brcm2708/patches-4.19/950-0106-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/target/linux/brcm2708/patches-4.19/950-0106-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
-@@ -5296,6 +5296,8 @@ int __init cgroup_init_early(void)
+@@ -5334,6 +5334,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
-@@ -5336,6 +5338,12 @@ int __init cgroup_init(void)
+@@ -5374,6 +5376,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 =
-@@ -5719,6 +5727,28 @@ static int __init cgroup_disable(char *s
+@@ -5765,6 +5773,28 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);