diff options
| -rw-r--r-- | kernel/cgroup/cgroup.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index c9b7a0cd1e30..030e4286f14c 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5137,8 +5137,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 @@ -5177,12 +5175,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 = @@ -5563,28 +5555,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); - /** * css_tryget_online_from_dir - get corresponding css from a cgroup dentry * @dentry: directory dentry of interest |