diff options
| author | Tejun Heo <tj@kernel.org> | 2013-05-23 21:53:09 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-05-23 21:53:09 -0400 |
| commit | 3f33e64f4a212771a0b5c63eddaa7f81e65223e3 (patch) | |
| tree | a212de935bb984849a5bf3bed3618dc9975203db /include/linux/cgroup.h | |
| parent | 23958e729e7029678e746bf8f4094c8863a79c3d (diff) | |
| parent | 7805d000db30a3787a4c969bab6ae4d8a5fd8ce6 (diff) | |
Merge branch 'for-3.10-fixes' into for-3.11
Merging to receive 7805d000db ("cgroup: fix a subtle bug in descendant
pre-order walk") so that further iterator updates can build upon it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/cgroup.h')
| -rw-r--r-- | include/linux/cgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 4f6f5138c340..1df5f699be61 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
| @@ -709,7 +709,7 @@ struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos); | |||
| 709 | * | 709 | * |
| 710 | * If a subsystem synchronizes against the parent in its ->css_online() and | 710 | * If a subsystem synchronizes against the parent in its ->css_online() and |
| 711 | * before starting iterating, and synchronizes against @pos on each | 711 | * before starting iterating, and synchronizes against @pos on each |
| 712 | * iteration, any descendant cgroup which finished ->css_offline() is | 712 | * iteration, any descendant cgroup which finished ->css_online() is |
| 713 | * guaranteed to be visible in the future iterations. | 713 | * guaranteed to be visible in the future iterations. |
| 714 | * | 714 | * |
| 715 | * In other words, the following guarantees that a descendant can't escape | 715 | * In other words, the following guarantees that a descendant can't escape |