diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-09-03 12:55:54 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-09-03 13:48:31 +0200 |
commit | 188c49b32112aae146a3ac3f870ad486cf1db11f (patch) | |
tree | 58b5198be64855b3ecdb44e1fb428205fd197a22 /target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch | |
parent | 49639b2d6176575a59086d9cae0eb4acbf532212 (diff) | |
download | upstream-188c49b32112aae146a3ac3f870ad486cf1db11f.tar.gz upstream-188c49b32112aae146a3ac3f870ad486cf1db11f.tar.bz2 upstream-188c49b32112aae146a3ac3f870ad486cf1db11f.zip |
kernel: bump 5.10 to 5.10.194
All patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch index 1f9043c229..0f9c7a97b5 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0639-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 -@@ -5799,6 +5799,9 @@ int __init cgroup_init_early(void) +@@ -5800,6 +5800,9 @@ int __init cgroup_init_early(void) return 0; } @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /** * cgroup_init - cgroup initialization * -@@ -5837,6 +5840,12 @@ int __init cgroup_init(void) +@@ -5838,6 +5841,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -6374,6 +6383,10 @@ static int __init cgroup_disable(char *s +@@ -6378,6 +6387,10 @@ static int __init cgroup_disable(char *s strcmp(token, ss->legacy_name)) continue; @@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static_branch_disable(cgroup_subsys_enabled_key[i]); pr_info("Disabling %s control group subsystem\n", ss->name); -@@ -6383,6 +6396,31 @@ static int __init cgroup_disable(char *s +@@ -6387,6 +6400,31 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); |