From c81168c9a607c2c00c3dc55ad401fd25f3398600 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Mon, 22 Feb 2010 17:04:51 -0800 Subject: [PATCH] --- yaml --- r: 182247 b: refs/heads/master c: 497f0ab39cd25bed317b29482c147c967f7ecd1f h: refs/heads/master i: 182245: 774f6ec9d0594a2e12335138229258bbd6dfa15b 182243: db91cf877ba6f42f0bc5d3862373cfc66c722816 182239: d7b7cd3976c5236aac4f23dde287e37879bf8a5c v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 20b836f5378b..ae796bb64534 100644 --- 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 index 70ae68680d4c..3218f5213717 100644 --- 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))