|
@@ -6868,9 +6868,9 @@ static void run_rebalance_domains(struct softirq_action *h)
|
|
|
nohz_idle_balance(this_cpu, idle);
|
|
|
}
|
|
|
|
|
|
-static inline int on_null_domain(int cpu)
|
|
|
+static inline int on_null_domain(struct rq *rq)
|
|
|
{
|
|
|
- return !rcu_dereference_sched(cpu_rq(cpu)->sd);
|
|
|
+ return !rcu_dereference_sched(rq->sd);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -6882,10 +6882,10 @@ void trigger_load_balance(struct rq *rq)
|
|
|
|
|
|
/* Don't need to rebalance while attached to NULL domain */
|
|
|
if (time_after_eq(jiffies, rq->next_balance) &&
|
|
|
- likely(!on_null_domain(cpu)))
|
|
|
+ likely(!on_null_domain(rq)))
|
|
|
raise_softirq(SCHED_SOFTIRQ);
|
|
|
#ifdef CONFIG_NO_HZ_COMMON
|
|
|
- if (nohz_kick_needed(rq) && likely(!on_null_domain(cpu)))
|
|
|
+ if (nohz_kick_needed(rq) && likely(!on_null_domain(rq)))
|
|
|
nohz_balancer_kick(cpu);
|
|
|
#endif
|
|
|
}
|