Merge branch 'linus' into sched/core

Merge reason: update to latest upstream

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-04-02 20:02:55 +02:00
5698 changed files with 387440 additions and 171327 deletions

View File

@@ -3411,7 +3411,7 @@ static void run_rebalance_domains(struct softirq_action *h)
static inline int on_null_domain(int cpu)
{
return !rcu_dereference(cpu_rq(cpu)->sd);
return !rcu_dereference_sched(cpu_rq(cpu)->sd);
}
/*