summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2019-06-26 17:44:13 +0200
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-07-23 14:57:13 -0400
commit34d18476fc4e824d6eaba6fd5d3b876c9477dd14 (patch)
tree9677169c5256f2263bccc220800353073c476e2d
parent77c5f4a8fb4da182d855520c3645e94fc8b7531b (diff)
Revert "futex: Ensure lock/unlock symetry versus pi_lock and hash bucket lock"
[ Upstream commit 6a773b70cf105b46298ed3b44e77c102ce31d9ec ] Drop the RT fixup, the futex code will be changed to avoid the need for the workaround. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel/futex.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index fe90164aa6ec..a58af833bb77 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -918,9 +918,7 @@ void exit_pi_state_list(struct task_struct *curr)
if (head->next != next) {
/* retain curr->pi_lock for the loop invariant */
raw_spin_unlock(&pi_state->pi_mutex.wait_lock);
- raw_spin_unlock_irq(&curr->pi_lock);
spin_unlock(&hb->lock);
- raw_spin_lock_irq(&curr->pi_lock);
put_pi_state(pi_state);
continue;
}