summaryrefslogtreecommitdiff
path: root/kernel/sched/rt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-10 11:32:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-10 11:32:01 -0700
commitac2440654df6ac7314e2f8819fe05e7c863a2392 (patch)
treebe0cc8040cc19c67a2dd035aacedb54ab4dd41e6 /kernel/sched/rt.c
parent2d0bd9534c8ddaebee64e1b4b7d621915f65e994 (diff)
parent13b5ab02ae118fc8dfdc2b8597688ec4a11d5b53 (diff)
downloadlinux-ac2440654df6ac7314e2f8819fe05e7c863a2392.tar.gz
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
Diffstat (limited to 'kernel/sched/rt.c')
-rw-r--r--kernel/sched/rt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index c41ea7ac1764..ec4f538d4396 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -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);