Commit 8b810a3a authored Jul 21, 2017 by Linus Torvalds

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

parents 34eddefe 69f0d429

kernel/locking/rtmutex.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -963,7 +963,6 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
	return -EDEADLK;		return -EDEADLK;

	raw_spin_lock(&task->pi_lock);		raw_spin_lock(&task->pi_lock);
	rt_mutex_adjust_prio(task);
	waiter->task = task;		waiter->task = task;
	waiter->lock = lock;		waiter->lock = lock;
	waiter->prio = task->prio;		waiter->prio = task->prio;