From 87e71e36210b5da4eb707991e67356ac8f4818a0 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Wed, 3 Mar 2010 07:46:58 -0800
Subject: [PATCH] --- yaml --- r: 187882 b: refs/heads/master c:
 5ed42b8113667c06a6ff2c72717395b5044d30a1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae6a6fa747f5..69640572c461 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db1466b3e1bd1727375cdbfcbea4bcce2f860f61
+refs/heads/master: 5ed42b8113667c06a6ff2c72717395b5044d30a1
diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h
index a73e1ced09b8..c9bbcb2a75ae 100644
--- a/trunk/include/linux/cgroup.h
+++ b/trunk/include/linux/cgroup.h
@@ -489,7 +489,6 @@ 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());
 }