Merge tag 'backlight-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / cgroup / cgroup.c

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index f2eeff7..fefa219 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -281,9 +281,6 @@ bool cgroup_ssid_enabled(int ssid)
  * - cpuset: a task can be moved into an empty cpuset, and again it takes
  *   masks of ancestors.
  *
- * - memcg: use_hierarchy is on by default and the cgroup file for the flag
- *   is not created.
- *
  * - blkcg: blk-throttle becomes properly hierarchical.
  *
  * - debug: disallowed on the default hierarchy.
@@ -5152,15 +5149,6 @@ static struct cgroup_subsys_state *css_create(struct cgroup *cgrp,
        if (err)
                goto err_list_del;
 
-       if (ss->broken_hierarchy && !ss->warned_broken_hierarchy &&
-           cgroup_parent(parent)) {
-               pr_warn("%s (%d) created nested cgroup for controller \"%s\" which has incomplete hierarchy support. Nested cgroups may change behavior in the future.\n",
-                       current->comm, current->pid, ss->name);
-               if (!strcmp(ss->name, "memory"))
-                       pr_warn("\"memory\" requires setting use_hierarchy to 1 on the root\n");
-               ss->warned_broken_hierarchy = true;
-       }
-
        return css;
 
 err_list_del: