From 768679ca1aea5989fda111c3c93920b01376fbcc Mon Sep 17 00:00:00 2001 From: Joonsoo Kim Date: Tue, 23 Apr 2013 17:27:38 +0900 Subject: [PATCH] --- yaml --- r: 366107 b: refs/heads/master c: de5eb2dd7f171ee8a45d23cd41aa2efe9ab922b3 h: refs/heads/master i: 366105: 2d2b89c1cf3e1da7b3e9b6c591b11d45b2325d32 366103: 5fb2ffd26bea71b133b51604692310bc6937dde5 v: v3 --- [refs] | 2 +- trunk/kernel/sched/fair.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 01b882d82a09..789bf3fce22b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1cd0858100c67273f2c74344e0c464344c4a982 +refs/heads/master: de5eb2dd7f171ee8a45d23cd41aa2efe9ab922b3 diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index 25aaf93281de..726e12905725 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -5523,10 +5523,11 @@ static void rebalance_domains(int cpu, enum cpu_idle_type idle) if (time_after_eq(jiffies, sd->last_balance + interval)) { if (load_balance(cpu, rq, sd, idle, &balance)) { /* - * We've pulled tasks over so either we're no - * longer idle. + * The LBF_SOME_PINNED logic could have changed + * env->dst_cpu, so we can't know our idle + * state even if we migrated tasks. Update it. */ - idle = CPU_NOT_IDLE; + idle = idle_cpu(cpu) ? CPU_IDLE : CPU_NOT_IDLE; } sd->last_balance = jiffies; }