From 7916fc66dc0352c787fff746c0a7e47b81864b9d Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 23 Apr 2010 10:35:52 +0800
Subject: [PATCH] --- yaml --- r: 190682 b: refs/heads/master c:
 1ce7e4ff24fe338438bc7837e02780f202bf202b h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/cgroup.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 251f12621522..c4d9f6f1f13b 100644
--- 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
index b8ad1ea99586..8f78073d7caa 100644
--- 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());
 }