diff --git a/[refs] b/[refs] index 6df80a59044f..8f9f64dddec9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c6c3fad81787e8cb4c85ddfd573b0d8442fe630 +refs/heads/master: c6ca57500c23d57a4ccec9874b6a3c99c297e1b5 diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index 421557fcbfe4..c6bd67b3fcf6 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -2825,6 +2825,7 @@ static void cgroup_enable_task_cg_lists(void) } void cgroup_iter_start(struct cgroup *cgrp, struct cgroup_iter *it) + __acquires(css_set_lock) { /* * The first time anyone tries to iterate across a cgroup, @@ -2864,6 +2865,7 @@ struct task_struct *cgroup_iter_next(struct cgroup *cgrp, } void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it) + __releases(css_set_lock) { read_unlock(&css_set_lock); }