From 188c49b32112aae146a3ac3f870ad486cf1db11f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 3 Sep 2023 12:55:54 +0200 Subject: kernel: bump 5.10 to 5.10.194 All patches automatically rebased. Signed-off-by: Hauke Mehrtens --- .../patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch | 2 +- .../950-0639-cgroup-Disable-cgroup-memory-by-default.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/bcm27xx/patches-5.10') diff --git a/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch b/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch index be22f7ec28..feaaeb3d74 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0537-clk-Introduce-a-clock-request-API.patch @@ -272,7 +272,7 @@ Signed-off-by: Maxime Ripard struct device_node; struct of_phandle_args; -@@ -828,6 +829,9 @@ int clk_save_context(void); +@@ -836,6 +837,9 @@ int clk_save_context(void); */ void clk_restore_context(void); 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 --- 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 /** * 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 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 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); -- cgit v1.2.3