1 From 058236ea822406c145b76174c8833e46a6b0a4a7 Mon Sep 17 00:00:00 2001
2 From: P33M <p33m@github.com>
3 Date: Wed, 24 Apr 2019 14:25:09 +0100
4 Subject: [PATCH 428/773] Revert "cgroup: Disable cgroup "memory" by default"
6 This reverts commit cd6ce4d0ded13c94ff5208c679ed5e030263149b.
8 kernel/cgroup/cgroup.c | 30 ------------------------------
9 1 file changed, 30 deletions(-)
11 --- a/kernel/cgroup/cgroup.c
12 +++ b/kernel/cgroup/cgroup.c
13 @@ -5334,8 +5334,6 @@ int __init cgroup_init_early(void)
16 static u16 cgroup_disable_mask __initdata;
17 -static u16 cgroup_enable_mask __initdata;
18 -static int __init cgroup_disable(char *str);
21 * cgroup_init - cgroup initialization
22 @@ -5376,12 +5374,6 @@ int __init cgroup_init(void)
24 mutex_unlock(&cgroup_mutex);
26 - /* Apply an implicit disable... */
27 - cgroup_disable("memory");
29 - /* ...knowing that an explicit enable will override it. */
30 - cgroup_disable_mask &= ~cgroup_enable_mask;
32 for_each_subsys(ss, ssid) {
34 struct cgroup_subsys_state *css =
35 @@ -5773,28 +5765,6 @@ static int __init cgroup_disable(char *s
37 __setup("cgroup_disable=", cgroup_disable);
39 -static int __init cgroup_enable(char *str)
41 - struct cgroup_subsys *ss;
45 - while ((token = strsep(&str, ",")) != NULL) {
49 - for_each_subsys(ss, i) {
50 - if (strcmp(token, ss->name) &&
51 - strcmp(token, ss->legacy_name))
54 - cgroup_enable_mask |= 1 << i;
59 -__setup("cgroup_enable=", cgroup_enable);
62 * css_tryget_online_from_dir - get corresponding css from a cgroup dentry
63 * @dentry: directory dentry of interest