From: Limeng <meng...@windriver.com>
This reverts commit 42647e31456a0736141b8566bd22894670c1c7a7.
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...@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 f199722519bb..080561bb8a4b 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5705,8 +5705,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
@@ -5746,12 +5744,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 =
@@ -6171,28 +6163,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.17.1
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
