From be4abbd84ab7e1492ded6e37aab34936c6fe9a23 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 15 Sep 2022 09:56:36 -0400 Subject: kernel: bump 5.10 to 5.10.143 All patches automatically rebased. Signed-off-by: John Audia (cherry picked from commit b77217d916ba48accbdb46589e6e5e3a9972c44e) --- .../950-0639-cgroup-Disable-cgroup-memory-by-default.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/bcm27xx') 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 c5865d4a0e..639dc9fe9b 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 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5744,6 +5744,9 @@ int __init cgroup_init_early(void) +@@ -5785,6 +5785,9 @@ int __init cgroup_init_early(void) return 0; } @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /** * cgroup_init - cgroup initialization * -@@ -5782,6 +5785,12 @@ int __init cgroup_init(void) +@@ -5823,6 +5826,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -6320,6 +6329,10 @@ static int __init cgroup_disable(char *s +@@ -6361,6 +6370,10 @@ static int __init cgroup_disable(char *s strcmp(token, ss->legacy_name)) continue; @@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell static_branch_disable(cgroup_subsys_enabled_key[i]); pr_info("Disabling %s control group subsystem\n", ss->name); -@@ -6329,6 +6342,31 @@ static int __init cgroup_disable(char *s +@@ -6370,6 +6383,31 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); -- cgit v1.2.3