@@ -8136,7 +8136,6 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle)
static inline bool nohz_kick_needed(struct rq *rq)
{
unsigned long now = jiffies;
- struct sched_domain_shared *sds;
struct sched_domain *sd;
int nr_busy, cpu = rq->cpu;
bool kick = false;
@@ -8165,13 +8164,13 @@ static inline bool nohz_kick_needed(struct rq *rq)
return true;
rcu_read_lock();
- sds = rcu_dereference(per_cpu(sd_llc_shared, cpu));
- if (sds) {
+ sd = rcu_dereference(per_cpu(sd_llc, cpu));
+ if (sd) {
/*
* XXX: write a coherent comment on why we do this.
* See also: http:lkml.kernel.org/r/20111202010832.602203411@sbsiddha-desk.sc.intel.com
*/
- nr_busy = atomic_read(&sds->nr_busy_cpus);
+ nr_busy = atomic_read(&sd->shared->nr_busy_cpus);
if (nr_busy > 1) {
kick = true;
goto unlock;