Revert "cgroup: Disable cgroup "memory" by default"

This reverts commit 2b13c54592135b6fab269517ed687fa9f80bf8e5.

The feature is used for saving memory which is consumed by memcg-related
structure (32bytes per 4K page), but now it is no longer merged on the
latest raspberry pi kernel. So instead of enabling memory cgroup by
adding command to cmdline.txt while preserving this feature, in order to
enable memory cgroup by default, this reverts commit '2b13c5459213
("cgroup: Disable cgroup "memory" by default")'

Change-Id: I1830129125fb44b36bfe64f97fddf329ea795c3c
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index b58ece4..a92990f 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5875,9 +5875,6 @@ int __init cgroup_init_early(void)
        return 0;
 }
 
-static u16 cgroup_enable_mask __initdata;
-static int __init cgroup_disable(char *str);
-
 /**
  * cgroup_init - cgroup initialization
  *
@@ -5916,12 +5913,6 @@ int __init cgroup_init(void)
 
        mutex_unlock(&cgroup_mutex);
 
-       /*
-        * Apply an implicit disable, knowing that an explicit enable will
-        * prevent if from doing anything.
-        */
-       cgroup_disable("memory");
-
        for_each_subsys(ss, ssid) {
                if (ss->early_init) {
                        struct cgroup_subsys_state *css =
@@ -6512,10 +6503,6 @@ static int __init cgroup_disable(char *str)
                            strcmp(token, ss->legacy_name))
                                continue;
 
-                       /* An explicit cgroup_enable overrides a disable */
-                       if (cgroup_enable_mask & (1 << i))
-                               continue;
-
                        static_branch_disable(cgroup_subsys_enabled_key[i]);
                        pr_info("Disabling %s control group subsystem\n",
                                ss->name);
@@ -6534,31 +6521,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;
-                       static_branch_enable(cgroup_subsys_enabled_key[i]);
-                       pr_info("Enabling %s control group subsystem\n",
-                               ss->name);
-               }
-       }
-       return 1;
-}
-__setup("cgroup_enable=", cgroup_enable);
-
 void __init __weak enable_debug_cgroup(void) { }
 
 static int __init enable_cgroup_debug(char *str)