diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 70ae68680d4c..3218f5213717 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -645,7 +645,7 @@ static inline int cpu_of(struct rq *rq) | |||
645 | #endif | 645 | #endif |
646 | } | 646 | } |
647 | 647 | ||
648 | #define for_each_domain_rd(p) \ | 648 | #define rcu_dereference_check_sched_domain(p) \ |
649 | rcu_dereference_check((p), \ | 649 | rcu_dereference_check((p), \ |
650 | rcu_read_lock_sched_held() || \ | 650 | rcu_read_lock_sched_held() || \ |
651 | lockdep_is_held(&sched_domains_mutex)) | 651 | lockdep_is_held(&sched_domains_mutex)) |
@@ -658,7 +658,7 @@ static inline int cpu_of(struct rq *rq) | |||
658 | * preempt-disabled sections. | 658 | * preempt-disabled sections. |
659 | */ | 659 | */ |
660 | #define for_each_domain(cpu, __sd) \ | 660 | #define for_each_domain(cpu, __sd) \ |
661 | for (__sd = for_each_domain_rd(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent) | 661 | for (__sd = rcu_dereference_check_sched_domain(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent) |
662 | 662 | ||
663 | #define cpu_rq(cpu) (&per_cpu(runqueues, (cpu))) | 663 | #define cpu_rq(cpu) (&per_cpu(runqueues, (cpu))) |
664 | #define this_rq() (&__get_cpu_var(runqueues)) | 664 | #define this_rq() (&__get_cpu_var(runqueues)) |