Commit ac244065 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Ingo Molnar:
 "A UP kernel cpufreq fix and a rt/dl scheduler corner case fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/rt, sched/dl: Don't push if task's scheduling class was changed
  sched/fair: Fix !CONFIG_SMP kernel cpufreq governor breakage
parents 2d0bd953 13b5ab02

kernel/sched/deadline.c

+1 −0
Original line number Diff line number Diff line
@@ -1394,6 +1394,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq) 
				     !cpumask_test_cpu(later_rq->cpu,

				                       &task->cpus_allowed) ||

				     task_running(rq, task) ||

				     !dl_task(task) ||

				     !task_on_rq_queued(task))) {

				double_unlock_balance(rq, later_rq);

				later_rq = NULL;

kernel/sched/fair.c

+8 −1
Original line number Diff line number Diff line
@@ -3030,7 +3030,14 @@ static int idle_balance(struct rq *this_rq); 


#else /* CONFIG_SMP */



static inline void update_load_avg(struct sched_entity *se, int update_tg) {}

static inline void update_load_avg(struct sched_entity *se, int not_used)

{

	struct cfs_rq *cfs_rq = cfs_rq_of(se);

	struct rq *rq = rq_of(cfs_rq);



	cpufreq_trigger_update(rq_clock(rq));

}



static inline void

enqueue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}

static inline void

kernel/sched/rt.c

+1 −0
Original line number Diff line number Diff line
@@ -1729,6 +1729,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq) 
				     !cpumask_test_cpu(lowest_rq->cpu,

						       tsk_cpus_allowed(task)) ||

				     task_running(rq, task) ||

				     !rt_task(task) ||

				     !task_on_rq_queued(task))) {



				double_unlock_balance(rq, lowest_rq);

CRA Git | Maintained and supported by SUSTech CRA and CCSE