From 3b48e4a1f5714bb5213743ac2ad8ba035cb3e200 Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Date: Tue, 27 Dec 2011 07:46:26 +0200
Subject: [PATCH] --- yaml --- r: 281479 b: refs/heads/master c:
 c6ca57500c23d57a4ccec9874b6a3c99c297e1b5 h: refs/heads/master i:   281477:
 c354fce5ef802c7956411b188dcadaa19fbe2b2e   281475:
 002295a09df3e9467c3fa7a50aa0586b7fd94777   281471:
 65524a515855477c7066cc42d7669847c50c9f49 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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);
 }