From: Wanpeng Li <liwp@xxxxxxxxxxxxxxxxxx> Signed-off-by: Wanpeng Li <liwp.linux@xxxxxxxxx> --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f72b5e5..776fc57 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4873,7 +4873,7 @@ mem_cgroup_create(struct cgroup *cont) goto free_out; /* root ? */ - if (cont->parent == NULL) { + if (!(mem_cgroup_is_root(cont))) { int cpu; enable_swap_cgroup(); parent = NULL; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html