From 238295e1edf9f6aba72d570e8afee2ecec56a1fc Mon Sep 17 00:00:00 2001 Message-Id: <238295e1edf9f6aba72d570e8afee2ecec56a1fc.1596234184.git.zanussi@kernel.org> In-Reply-To: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org> References: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org> From: Sebastian Andrzej Siewior Date: Wed, 26 Jun 2019 17:44:13 +0200 Subject: [PATCH 272/329] Revert "futex: Ensure lock/unlock symetry versus pi_lock and hash bucket lock" Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.135-rt60.tar.xz [ 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 Signed-off-by: Steven Rostedt (VMware) --- kernel/futex.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index 084527af43d4..b99266393c52 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -938,9 +938,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; } -- 2.17.1