From 2e7dac7041d5d54f73e420352405bb6dafc23068 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Sat, 27 Feb 2010 14:53:08 -0800
Subject: [PATCH] --- yaml --- r: 187876 b: refs/heads/master c:
 1883c79a57a5fe25309007590cccb1b2782c41b2 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 62846fec419f..763deb5f0eb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 622ea685f1fafdf84d612440535c84341f0860b8
+refs/heads/master: 1883c79a57a5fe25309007590cccb1b2782c41b2
diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h
index c9bbcb2a75ae..a73e1ced09b8 100644
--- a/trunk/include/linux/cgroup.h
+++ b/trunk/include/linux/cgroup.h
@@ -489,6 +489,7 @@ static inline struct cgroup_subsys_state *task_subsys_state(
 {
 	return rcu_dereference_check(task->cgroups->subsys[subsys_id],
 				     rcu_read_lock_held() ||
+				     !rcu_scheduler_active ||
 				     cgroup_lock_is_held());
 }