diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 11:59:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 11:59:57 +0200 |
| commit | bb2ebf08869c4404dc2f8fb6fe3e4b6b00bb40ad (patch) | |
| tree | 9bd871abc2f4d19dc3c0d0e9cbecef795d79981b /kernel/locking/rtmutex.c | |
| parent | sched/core: Remove __cpuinit section tag that crept back in (diff) | |
| parent | sched/core: Fix regression in cpuset_cpu_inactive() for suspend (diff) | |
| download | linux-bb2ebf08869c4404dc2f8fb6fe3e4b6b00bb40ad.tar.gz linux-bb2ebf08869c4404dc2f8fb6fe3e4b6b00bb40ad.zip | |
Merge branch 'sched/urgent' into sched/core, before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/rtmutex.c')
| -rw-r--r-- | kernel/locking/rtmutex.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index b73279367087..b025295f4966 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -265,15 +265,17 @@ struct task_struct *rt_mutex_get_top_task(struct task_struct *task) } /* - * Called by sched_setscheduler() to check whether the priority change - * is overruled by a possible priority boosting. + * Called by sched_setscheduler() to get the priority which will be + * effective after the change. */ -int rt_mutex_check_prio(struct task_struct *task, int newprio) +int rt_mutex_get_effective_prio(struct task_struct *task, int newprio) { if (!task_has_pi_waiters(task)) - return 0; + return newprio; - return task_top_pi_waiter(task)->task->prio <= newprio; + if (task_top_pi_waiter(task)->task->prio <= newprio) + return task_top_pi_waiter(task)->task->prio; + return newprio; } /* |