diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 11:11:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 11:11:23 -0700 |
| commit | 8b810a3a35eec9cd5e9245266dd0ae10de063094 (patch) | |
| tree | 0aec06b7cca4eeae6c6778f5c23d4f3b1dbc38f1 | |
| parent | 34eddefee41a56b378d866897bf83ed909fb4ab3 (diff) | |
| parent | 69f0d429c413fe96db2c187475cebcc6e3a8c7f5 (diff) | |
| download | lwn-8b810a3a35eec9cd5e9245266dd0ae10de063094.tar.gz lwn-8b810a3a35eec9cd5e9245266dd0ae10de063094.zip | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixlet from Ingo Molnar:
"Remove an unnecessary priority adjustment in the rtmutex code"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/rtmutex: Remove unnecessary priority adjustment
| -rw-r--r-- | kernel/locking/rtmutex.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 78069895032a..649dc9d3951a 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -963,7 +963,6 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, return -EDEADLK; raw_spin_lock(&task->pi_lock); - rt_mutex_adjust_prio(task); waiter->task = task; waiter->lock = lock; waiter->prio = task->prio; |