diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 14:02:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 14:03:08 -0400 |
| commit | c9494727cf293ae2ec66af57547a3e79c724fec2 (patch) | |
| tree | 44ae197b64fa7530ee695a90ad31326dda06f1e1 /kernel/sched_fair.c | |
| parent | 6427462bfa50f50dc6c088c07037264fcc73eca1 (diff) | |
| parent | 42be79e37e264557f12860fa4cc84b4de3685954 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_fair.c')
| -rw-r--r-- | kernel/sched_fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 35a5c649638b..49ad99378f82 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
| @@ -3411,7 +3411,7 @@ static void run_rebalance_domains(struct softirq_action *h) | |||
| 3411 | 3411 | ||
| 3412 | static inline int on_null_domain(int cpu) | 3412 | static inline int on_null_domain(int cpu) |
| 3413 | { | 3413 | { |
| 3414 | return !rcu_dereference(cpu_rq(cpu)->sd); | 3414 | return !rcu_dereference_sched(cpu_rq(cpu)->sd); |
| 3415 | } | 3415 | } |
| 3416 | 3416 | ||
| 3417 | /* | 3417 | /* |