2019-08-18 21:33:52 +00:00
|
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
Date: Wed, 26 Jun 2019 17:44:13 +0200
|
2019-11-25 00:04:39 +00:00
|
|
|
Subject: [PATCH 276/290] Revert "futex: Ensure lock/unlock symetry versus
|
2019-08-18 21:33:52 +00:00
|
|
|
pi_lock and hash bucket lock"
|
2019-11-25 00:04:39 +00:00
|
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=cf2d016887fc80fdc7b517711849d31904430e8a
|
2019-08-18 21:33:52 +00:00
|
|
|
|
|
|
|
|
[ 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>
|
|
|
|
|
---
|
|
|
|
|
kernel/futex.c | 2 --
|
|
|
|
|
1 file changed, 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;
|
|
|
|
|
}
|
