diff options
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) | |||
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | /* | 267 | /* |
| 268 | * Called by sched_setscheduler() to check whether the priority change | 268 | * Called by sched_setscheduler() to get the priority which will be |
| 269 | * is overruled by a possible priority boosting. | 269 | * effective after the change. |
| 270 | */ | 270 | */ |
| 271 | int rt_mutex_check_prio(struct task_struct *task, int newprio) | 271 | int rt_mutex_get_effective_prio(struct task_struct *task, int newprio) |
| 272 | { | 272 | { |
| 273 | if (!task_has_pi_waiters(task)) | 273 | if (!task_has_pi_waiters(task)) |
| 274 | return 0; | 274 | return newprio; |
| 275 | 275 | ||
| 276 | return task_top_pi_waiter(task)->task->prio <= newprio; | 276 | if (task_top_pi_waiter(task)->task->prio <= newprio) |
| 277 | return task_top_pi_waiter(task)->task->prio; | ||
| 278 | return newprio; | ||
| 277 | } | 279 | } |
| 278 | 280 | ||
| 279 | /* | 281 | /* |
