blob: e6d02dd9b2caec2604c27cd72fb455e11b96ca35 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 26 Jun 2019 17:44:13 +0200
Subject: [PATCH 271/354] Revert "futex: Ensure lock/unlock symetry versus
pi_lock and hash bucket lock"
Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=4015f4555d680fed5664a5a70ba7301c112dfec4
[ 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 3d2570e9c8c1..2cfeaa8e9379 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -962,9 +962,7 @@ static 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;
}
|
