diff options
Diffstat (limited to 'include/linux/cgroup.h')
-rw-r--r-- | include/linux/cgroup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 7d73905dcba2..900af5964f55 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -203,6 +203,7 @@ struct cgroup { | |||
203 | 203 | ||
204 | /* For RCU-protected deletion */ | 204 | /* For RCU-protected deletion */ |
205 | struct rcu_head rcu_head; | 205 | struct rcu_head rcu_head; |
206 | struct work_struct free_work; | ||
206 | 207 | ||
207 | /* List of events which userspace want to receive */ | 208 | /* List of events which userspace want to receive */ |
208 | struct list_head event_list; | 209 | struct list_head event_list; |
@@ -558,6 +559,7 @@ static inline struct cgroup* task_cgroup(struct task_struct *task, | |||
558 | 559 | ||
559 | struct cgroup *cgroup_next_descendant_pre(struct cgroup *pos, | 560 | struct cgroup *cgroup_next_descendant_pre(struct cgroup *pos, |
560 | struct cgroup *cgroup); | 561 | struct cgroup *cgroup); |
562 | struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos); | ||
561 | 563 | ||
562 | /** | 564 | /** |
563 | * cgroup_for_each_descendant_pre - pre-order walk of a cgroup's descendants | 565 | * cgroup_for_each_descendant_pre - pre-order walk of a cgroup's descendants |
@@ -706,7 +708,6 @@ struct cgroup_subsys_state *cgroup_css_from_dir(struct file *f, int id); | |||
706 | static inline int cgroup_init_early(void) { return 0; } | 708 | static inline int cgroup_init_early(void) { return 0; } |
707 | static inline int cgroup_init(void) { return 0; } | 709 | static inline int cgroup_init(void) { return 0; } |
708 | static inline void cgroup_fork(struct task_struct *p) {} | 710 | static inline void cgroup_fork(struct task_struct *p) {} |
709 | static inline void cgroup_fork_callbacks(struct task_struct *p) {} | ||
710 | static inline void cgroup_post_fork(struct task_struct *p) {} | 711 | static inline void cgroup_post_fork(struct task_struct *p) {} |
711 | static inline void cgroup_exit(struct task_struct *p, int callbacks) {} | 712 | static inline void cgroup_exit(struct task_struct *p, int callbacks) {} |
712 | 713 | ||