---

yaml --- r: 187882 b: refs/heads/master c: 5ed42b8 h: refs/heads/master v: v3
git-mirror · Mar 4, 2010 · 87e71e3 · 87e71e3
1 parent 05a86e8
commit 87e71e3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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());
 }