aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-02-17 05:58:14 -0500
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-02-19 07:15:59 +0100
commit76d1168d0d4b9d76e2ad78c0fc6b255561deb284 (patch)
tree60fd91fe322d516bfd5147bf33019c03c8ad32e8 /target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
parentcbe4beb442e10f9ad8fc71202e87c15a0859c44c (diff)
downloadupstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.gz
upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.bz2
upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.zip
kernel: bump 5.4 to 5.4.99
Ran update_kernel.sh in a fresh clone without any existing toolchains. No manual changes needed. Build system: x86_64 Build-tested: bcm27xx/bcm2711 Signed-off-by: John Audia <graysky@archlinux.us> (cherry-picked from commit 5d3a6fd970)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
index 30eefd3e21..86f60e7052 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0089-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
-@@ -5720,6 +5720,8 @@ int __init cgroup_init_early(void)
+@@ -5722,6 +5722,8 @@ int __init cgroup_init_early(void)
}
static u16 cgroup_disable_mask __initdata;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/**
* cgroup_init - cgroup initialization
-@@ -5759,6 +5761,12 @@ int __init cgroup_init(void)
+@@ -5761,6 +5763,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex);
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
-@@ -6178,6 +6186,28 @@ static int __init cgroup_disable(char *s
+@@ -6180,6 +6188,28 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);