From 95eef94518f050146820340787b2472db13c38ae Mon Sep 17 00:00:00 2001 From: P33M Date: Wed, 24 Apr 2019 14:25:09 +0100 Subject: [PATCH 430/725] Revert "cgroup: Disable cgroup "memory" by default" This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b. --- kernel/cgroup/cgroup.c | 30 ------------------------------ 1 file changed, 30 deletions(-) --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5334,8 +5334,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 @@ -5376,12 +5374,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 = @@ -5773,28 +5765,6 @@ 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; - } - } - return 1; -} -__setup("cgroup_enable=", cgroup_enable); - /** * css_tryget_online_from_dir - get corresponding css from a cgroup dentry * @dentry: directory dentry of interest