diff options
-rw-r--r-- | include/linux/cgroup.h | 1 | ||||
-rw-r--r-- | kernel/cgroup.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 565c8034e6c8..d3f5fba2c159 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -472,7 +472,6 @@ struct cgroup_subsys { | |||
472 | void (*fork)(struct task_struct *task); | 472 | void (*fork)(struct task_struct *task); |
473 | void (*exit)(struct cgroup *cgrp, struct cgroup *old_cgrp, | 473 | void (*exit)(struct cgroup *cgrp, struct cgroup *old_cgrp, |
474 | struct task_struct *task); | 474 | struct task_struct *task); |
475 | int (*populate)(struct cgroup_subsys *ss, struct cgroup *cgrp); | ||
476 | void (*post_clone)(struct cgroup *cgrp); | 475 | void (*post_clone)(struct cgroup *cgrp); |
477 | void (*bind)(struct cgroup *root); | 476 | void (*bind)(struct cgroup *root); |
478 | 477 | ||
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 2905977e0f33..b2f203f25ec8 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -3842,9 +3842,6 @@ static int cgroup_populate_dir(struct cgroup *cgrp) | |||
3842 | for_each_subsys(cgrp->root, ss) { | 3842 | for_each_subsys(cgrp->root, ss) { |
3843 | struct cftype_set *set; | 3843 | struct cftype_set *set; |
3844 | 3844 | ||
3845 | if (ss->populate && (err = ss->populate(ss, cgrp)) < 0) | ||
3846 | return err; | ||
3847 | |||
3848 | list_for_each_entry(set, &ss->cftsets, node) | 3845 | list_for_each_entry(set, &ss->cftsets, node) |
3849 | cgroup_addrm_files(cgrp, ss, set->cfts, true); | 3846 | cgroup_addrm_files(cgrp, ss, set->cfts, true); |
3850 | } | 3847 | } |