aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/cgroup.h1
-rw-r--r--kernel/cgroup.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 9c300ad9a911..64047ae7fde1 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -204,7 +204,6 @@ struct cgroup {
204 struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT]; 204 struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT];
205 205
206 struct cgroupfs_root *root; 206 struct cgroupfs_root *root;
207 struct cgroup *top_cgroup;
208 207
209 /* 208 /*
210 * List of cg_cgroup_links pointing at css_sets with 209 * List of cg_cgroup_links pointing at css_sets with
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 67804590d4b0..c16719e056ab 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1418,7 +1418,6 @@ static void init_cgroup_root(struct cgroupfs_root *root)
1418 root->number_of_cgroups = 1; 1418 root->number_of_cgroups = 1;
1419 cgrp->root = root; 1419 cgrp->root = root;
1420 cgrp->name = &root_cgroup_name; 1420 cgrp->name = &root_cgroup_name;
1421 cgrp->top_cgroup = cgrp;
1422 init_cgroup_housekeeping(cgrp); 1421 init_cgroup_housekeeping(cgrp);
1423 list_add_tail(&cgrp->allcg_node, &root->allcg_list); 1422 list_add_tail(&cgrp->allcg_node, &root->allcg_list);
1424} 1423}
@@ -4145,7 +4144,6 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry,
4145 4144
4146 cgrp->parent = parent; 4145 cgrp->parent = parent;
4147 cgrp->root = parent->root; 4146 cgrp->root = parent->root;
4148 cgrp->top_cgroup = parent->top_cgroup;
4149 4147
4150 if (notify_on_release(parent)) 4148 if (notify_on_release(parent))
4151 set_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags); 4149 set_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags);