Merge branch 'next' into for-linus

1 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index ce104e33cd22..5ac7ebc36dbb 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -240,7 +240,7 @@ struct cgroup {
         /* For RCU-protected deletion */
         struct rcu_head rcu_head;
 
-        /* List of events which userspace want to recieve */
+        /* List of events which userspace want to receive */
         struct list_head event_list;
         spinlock_t event_list_lock;
 };
@@ -474,7 +474,8 @@ struct cgroup_subsys {
                         struct cgroup *old_cgrp, struct task_struct *tsk,
                         bool threadgroup);
         void (*fork)(struct cgroup_subsys *ss, struct task_struct *task);
-        void (*exit)(struct cgroup_subsys *ss, struct task_struct *task);
+        void (*exit)(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                        struct cgroup *old_cgrp, struct task_struct *task);
         int (*populate)(struct cgroup_subsys *ss,
                         struct cgroup *cgrp);
         void (*post_clone)(struct cgroup_subsys *ss, struct cgroup *cgrp);
@@ -626,6 +627,7 @@ bool css_is_ancestor(struct cgroup_subsys_state *cg,
 /* Get id and depth of css */
 unsigned short css_id(struct cgroup_subsys_state *css);
 unsigned short css_depth(struct cgroup_subsys_state *css);
+struct cgroup_subsys_state *cgroup_css_from_dir(struct file *f, int id);
 
 #else /* !CONFIG_CGROUPS */