aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-09-15 08:07:08 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-09-17 14:16:37 +0200
commitfe209fa47d4f360ed0052e0029ba6b3cf8bc9780 (patch)
tree325270b59a0f6e0238ddfe499d90727c427ba0bb /target/linux/bcm27xx
parente785ca05e9f0502894772f5df92192b816ba5d7c (diff)
downloadupstream-fe209fa47d4f360ed0052e0029ba6b3cf8bc9780.tar.gz
upstream-fe209fa47d4f360ed0052e0029ba6b3cf8bc9780.tar.bz2
upstream-fe209fa47d4f360ed0052e0029ba6b3cf8bc9780.zip
kernel: bump 5.15 to 5.15.68
All patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bcm27xx')
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
index a2f7e21708..a836952eeb 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0035-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
-@@ -5834,6 +5834,9 @@ int __init cgroup_init_early(void)
+@@ -5875,6 +5875,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
*
-@@ -5872,6 +5875,12 @@ int __init cgroup_init(void)
+@@ -5913,6 +5916,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 =
-@@ -6456,6 +6465,10 @@ static int __init cgroup_disable(char *s
+@@ -6497,6 +6506,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);
-@@ -6474,6 +6487,31 @@ static int __init cgroup_disable(char *s
+@@ -6515,6 +6528,31 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);