aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2010-03-03 10:46:58 -0500
committerIngo Molnar <mingo@elte.hu>2010-03-04 06:07:31 -0500
commit5ed42b8113667c06a6ff2c72717395b5044d30a1 (patch)
tree8ff26d25bce55d48c931af21126b28b90c9bfc82 /include
parentdb1466b3e1bd1727375cdbfcbea4bcce2f860f61 (diff)
rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU
This patch removes the check for !rcu_scheduler_active because this check has been incorporated into rcu_dereference_check(). Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cgroup.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index a73e1ced09b8..c9bbcb2a75ae 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -489,7 +489,6 @@ static inline struct cgroup_subsys_state *task_subsys_state(
489{ 489{
490 return rcu_dereference_check(task->cgroups->subsys[subsys_id], 490 return rcu_dereference_check(task->cgroups->subsys[subsys_id],
491 rcu_read_lock_held() || 491 rcu_read_lock_held() ||
492 !rcu_scheduler_active ||
493 cgroup_lock_is_held()); 492 cgroup_lock_is_held());
494} 493}
495 494