aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-07-21 16:19:32 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-30 17:21:47 +0200
commitaedcbaae3798c2dc1e686fb2c958a8897b4f93c9 (patch)
tree4168ff56c1ac8f55564436ca76c6126e86b6cfeb /target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch
parenta409bd7705154045141e8fde408a33c19dfe9be9 (diff)
downloadupstream-aedcbaae3798c2dc1e686fb2c958a8897b4f93c9.tar.gz
upstream-aedcbaae3798c2dc1e686fb2c958a8897b4f93c9.tar.bz2
upstream-aedcbaae3798c2dc1e686fb2c958a8897b4f93c9.zip
kernel: bump 5.10 to 5.10.132
All patches automatically rebased. The following patch was replaced by a similar version upstream: bcm27xx/patches-5.10/950-0036-tty-amba-pl011-Add-un-throttle-support.patch Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 7d3c0928de191b203dd5b27ddf208698d08639e3)
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.patch8
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 84fbcdb2c2..c5865d4a0e 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
-@@ -5735,6 +5735,9 @@ int __init cgroup_init_early(void)
+@@ -5744,6 +5744,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
*
-@@ -5773,6 +5776,12 @@ int __init cgroup_init(void)
+@@ -5782,6 +5785,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 =
-@@ -6311,6 +6320,10 @@ static int __init cgroup_disable(char *s
+@@ -6320,6 +6329,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);
-@@ -6320,6 +6333,31 @@ static int __init cgroup_disable(char *s
+@@ -6329,6 +6342,31 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);