diff options
author | 2015-06-04 09:04:08 +0300 | |
---|---|---|
committer | 2015-06-05 16:55:52 +0300 | |
commit | 8dc0a56529f5d60bbb927049d48245b1a7989bf8 (patch) | |
tree | bf1a12dcae17094441e2b4d9a550e212d0d82006 /kernel/locking/rtmutex.c | |
parent | ASoC: omap-hdmi-audio: Fix invalid combination of DM_INH and CA (diff) | |
parent | arm/dts: am57xx-beagle-x15.dts: add HDMI (diff) | |
download | linux-dev-8dc0a56529f5d60bbb927049d48245b1a7989bf8.tar.xz linux-dev-8dc0a56529f5d60bbb927049d48245b1a7989bf8.zip |
Merge branch 'ti-dra7-dss' into 4.2/fbdev
Merge arch/ changes for TI's DRA7 SoC Display Subsystem.
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; } /* |