x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn

[~andy/linux] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 795e525afaba8914f3f8863de6a7299d84898ada..a72f2ffdc3d07b70925eaf2824c8a9ba7994c41c 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4973,6 +4973,13 @@ mem_cgroup_create(struct cgroup *cont)
        } else {
                res_counter_init(&memcg->res, NULL);
                res_counter_init(&memcg->memsw, NULL);
+               /*
+                * Deeper hierachy with use_hierarchy == false doesn't make
+                * much sense so let cgroup subsystem know about this
+                * unfortunate state in our controller.
+                */
+               if (parent && parent != root_mem_cgroup)
+                       mem_cgroup_subsys.broken_hierarchy = true;
        }
        memcg->last_scanned_node = MAX_NUMNODES;
        INIT_LIST_HEAD(&memcg->oom_notify);