diff --git a/[refs] b/[refs] index 5f48c99c10e2..91ffbf6e1ba9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c350a04efd1c89cd256b2abc8f07a21d0d53ff24 +refs/heads/master: 67d955383ab2ef8866c494c14156a4f3d29e441c diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c index 97540f0c9e47..e2698c0fc697 100644 --- a/trunk/kernel/sched_rt.c +++ b/trunk/kernel/sched_rt.c @@ -704,7 +704,7 @@ static inline int next_prio(struct rq *rq) { struct task_struct *next = pick_next_highest_task_rt(rq, rq->cpu); - if (next && rt_prio(next->prio)) + if (next) return next->prio; else return MAX_RT_PRIO;