From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 7 May 2014 11:15:46 +0000 (+0200)
Subject: Merge branch 'sched/urgent' into sched/core, to avoid conflicts
X-Git-Tag: v4.9.8~6247^2~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branch 'sched/urgent' into sched/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc
diff --cc kernel/sched/fair.c
index 43232b8,0fdb96d..5d859ec
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -6727,12 -6725,12 +6730,9 @@@ static int idle_balance(struct rq *this
  		this_rq->next_balance = next_balance;
  	}
  
- 	if (curr_cost > this_rq->max_idle_balance_cost)
- 		this_rq->max_idle_balance_cost = curr_cost;
- 
  out:
  	/* Is there a task of a high priority class? */
 -	if (this_rq->nr_running != this_rq->cfs.h_nr_running &&
 -	    ((this_rq->stop && this_rq->stop->on_rq) ||
 -	     this_rq->dl.dl_nr_running ||
 -	     (this_rq->rt.rt_nr_running && !rt_rq_throttled(&this_rq->rt))))
 +	if (this_rq->nr_running != this_rq->cfs.h_nr_running)
  		pulled_task = -1;
  
  	if (pulled_task) {