aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/rtmutex.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index a273183c37a..a6fbb413052 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -189,6 +189,19 @@ int rt_mutex_adjust_prio_chain(struct task_struct *task,
189 if (!waiter || !waiter->task) 189 if (!waiter || !waiter->task)
190 goto out_unlock_pi; 190 goto out_unlock_pi;
191 191
192 /*
193 * Check the orig_waiter state. After we dropped the locks,
194 * the previous owner of the lock might have released the lock
195 * and made us the pending owner:
196 */
197 if (orig_waiter && !orig_waiter->task)
198 goto out_unlock_pi;
199
200 /*
201 * Drop out, when the task has no waiters. Note,
202 * top_waiter can be NULL, when we are in the deboosting
203 * mode!
204 */
192 if (top_waiter && (!task_has_pi_waiters(task) || 205 if (top_waiter && (!task_has_pi_waiters(task) ||
193 top_waiter != task_top_pi_waiter(task))) 206 top_waiter != task_top_pi_waiter(task)))
194 goto out_unlock_pi; 207 goto out_unlock_pi;