---

yaml --- r: 190682 b: refs/heads/master c: 1ce7e4f h: refs/heads/master v: v3
git-mirror · May 4, 2010 · 7916fc6 · 7916fc6
1 parent 430517d
commit 7916fc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b629317e66fb1c6066c550dded45ab85a936163c
+refs/heads/master: 1ce7e4ff24fe338438bc7837e02780f202bf202b
diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h
@@ -530,6 +530,7 @@ static inline struct cgroup_subsys_state *task_subsys_state(
 {
 	return rcu_dereference_check(task->cgroups->subsys[subsys_id],
 				     rcu_read_lock_held() ||
+				     lockdep_is_held(&task->alloc_lock) ||
 				     cgroup_lock_is_held());
 }