---

yaml --- r: 182247 b: refs/heads/master c: 497f0ab h: refs/heads/master i: 182245: 774f6ec 182243: db91cf8 182239: d7b7cd3 v: v3
git-mirror · Feb 25, 2010 · c81168c · c81168c
1 parent 8a0e781
commit c81168c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d11c563dd20ff35da5652c3e1c989d9e10e1d6d0
+refs/heads/master: 497f0ab39cd25bed317b29482c147c967f7ecd1f
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -645,7 +645,7 @@ static inline int cpu_of(struct rq *rq)
 #endif
 }
 
-#define for_each_domain_rd(p) \
+#define rcu_dereference_check_sched_domain(p) \
 	rcu_dereference_check((p), \
 			      rcu_read_lock_sched_held() || \
 			      lockdep_is_held(&sched_domains_mutex))
@@ -658,7 +658,7 @@ static inline int cpu_of(struct rq *rq)
  * preempt-disabled sections.
  */
 #define for_each_domain(cpu, __sd) \
-	for (__sd = for_each_domain_rd(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent)
+	for (__sd = rcu_dereference_check_sched_domain(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent)
 
 #define cpu_rq(cpu)		(&per_cpu(runqueues, (cpu)))
 #define this_rq()		(&__get_cpu_var(runqueues))