[linux-yocto] [PATCH] Revert "cgroup: Disable cgroup "memory" by default"

[Meng.Li at windriver.com]

From: Limeng <Meng.Li at windriver.com>

This reverts commit bf6bf37699fcba93dbcf88e97c45c0b835d2dd4c.

It is not reasonable to disable a common cgroup feature.
Now, there is enough memory on raspberrypi 4 platform.

Signed-off-by: Meng Li <Meng.Li at windriver.com>
---
 kernel/cgroup/cgroup.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 81292f2f0da9..d2cba714d3ee 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5661,8 +5661,6 @@ int __init cgroup_init_early(void)
 }
 
 static u16 cgroup_disable_mask __initdata;
-static u16 cgroup_enable_mask __initdata;
-static int __init cgroup_disable(char *str);
 
 /**
  * cgroup_init - cgroup initialization
@@ -5703,12 +5701,6 @@ int __init cgroup_init(void)
 
 	mutex_unlock(&cgroup_mutex);
 
-	/* Apply an implicit disable... */
-	cgroup_disable("memory");
-
-	/* ...knowing that an explicit enable will override it. */
-	cgroup_disable_mask &= ~cgroup_enable_mask;
-
 	for_each_subsys(ss, ssid) {
 		if (ss->early_init) {
 			struct cgroup_subsys_state *css =
@@ -6125,28 +6117,6 @@ static int __init cgroup_disable(char *str)
 }
 __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;
-		}
-	}
-	return 1;
-}
-__setup("cgroup_enable=", cgroup_enable);
-
 void __init __weak enable_debug_cgroup(void) { }
 
 static int __init enable_cgroup_debug(char *str)
-- 
2.23.0