1 files changed, 0 insertions, 85 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
deleted file mode 100644
index d4818b2239..0000000000
--- a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 2b13c54592135b6fab269517ed687fa9f80bf8e5 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 27 Nov 2017 17:14:54 +0000
-Subject: [PATCH] cgroup: Disable cgroup "memory" by default
-
-Some Raspberry Pis have limited RAM and most users won't use the
-cgroup memory support so it is disabled by default. Enable with:
-
-    cgroup_enable=memory
-
-See: https://github.com/raspberrypi/linux/issues/1950
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- kernel/cgroup/cgroup.c | 38 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
---- a/kernel/cgroup/cgroup.c
-+++ b/kernel/cgroup/cgroup.c
-@@ -5721,6 +5721,9 @@ int __init cgroup_init_early(void)
- 	return 0;
- }
- 
-+static u16 cgroup_enable_mask __initdata;
-+static int __init cgroup_disable(char *str);
-+
- /**
-  * cgroup_init - cgroup initialization
-  *
-@@ -5759,6 +5762,12 @@ int __init cgroup_init(void)
- 
- 	mutex_unlock(&cgroup_mutex);
- 
-+	/*
-+	 * Apply an implicit disable, knowing that an explicit enable will
-+	 * prevent if from doing anything.
-+	 */
-+	cgroup_disable("memory");
-+
- 	for_each_subsys(ss, ssid) {
- 		if (ss->early_init) {
- 			struct cgroup_subsys_state *css =
-@@ -6168,6 +6177,10 @@ static int __init cgroup_disable(char *s
- 			    strcmp(token, ss->legacy_name))
- 				continue;
- 
-+			/* An explicit cgroup_enable overrides a disable */
-+			if (cgroup_enable_mask & (1 << i))
-+				continue;
-+
- 			static_branch_disable(cgroup_subsys_enabled_key[i]);
- 			pr_info("Disabling %s control group subsystem\n",
- 				ss->name);
-@@ -6177,6 +6190,31 @@ static int __init cgroup_disable(char *s
- }
- __setup("cgroup_disable=", cgroup_disable);
- 
-+static int __init cgroup_enable(char *str)
-+{
-+	struct cgroup_subsys *ss;
-+	char *token;
-+	int i;
-+
-+	while ((token = strsep(&str, ",")) != NULL) {
-+		if (!*token)
-+			continue;
-+
-+		for_each_subsys(ss, i) {
-+			if (strcmp(token, ss->name) &&
-+			    strcmp(token, ss->legacy_name))
-+				continue;
-+
-+			cgroup_enable_mask |= 1 << i;
-+			static_branch_enable(cgroup_subsys_enabled_key[i]);
-+			pr_info("Enabling %s control group subsystem\n",
-+				ss->name);
-+		}
-+	}
-+	return 1;
-+}
-+__setup("cgroup_enable=", cgroup_enable);
-+
- void __init __weak enable_debug_cgroup(void) { }
- 
- static int __init enable_cgroup_debug(char *str)