From 08f003891b84f52e49a5bdbc8a589fb052ac9a4e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 05:22:37 +0200 Subject: Merging debian version 4.19.260-1. Signed-off-by: Daniel Baumann --- ...x-Ensure-lock-unlock-symetry-versus-pi_lo.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 debian/patches-rt/0271-Revert-futex-Ensure-lock-unlock-symetry-versus-pi_lo.patch (limited to 'debian/patches-rt/0271-Revert-futex-Ensure-lock-unlock-symetry-versus-pi_lo.patch') diff --git a/debian/patches-rt/0271-Revert-futex-Ensure-lock-unlock-symetry-versus-pi_lo.patch b/debian/patches-rt/0271-Revert-futex-Ensure-lock-unlock-symetry-versus-pi_lo.patch new file mode 100644 index 000000000..c4309368f --- /dev/null +++ b/debian/patches-rt/0271-Revert-futex-Ensure-lock-unlock-symetry-versus-pi_lo.patch @@ -0,0 +1,31 @@ +From: Sebastian Andrzej Siewior +Date: Wed, 26 Jun 2019 17:44:13 +0200 +Subject: [PATCH 271/342] 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=d00bb8bbc139fe4cd03a34a820bc7ed395b791ea + +[ 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 a5a263a3efbf..3449a716a378 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; + } -- cgit v1.2.3