summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0352-workqueue-Fix-deadlock-due-to-recursive-locking-of-p.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:21:41 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:21:41 +0000
commitb488a8b2c3eaf68ad4778dbdc99bdda0b0d1ce6d (patch)
tree9f60f0d41af253fa943e7811f231d36852f10f1e /debian/patches-rt/0352-workqueue-Fix-deadlock-due-to-recursive-locking-of-p.patch
parentMerging upstream version 4.19.304. (diff)
downloadlinux-debian.tar.xz
linux-debian.zip
Adding debian version 4.19.304-1.debian/4.19.304-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0352-workqueue-Fix-deadlock-due-to-recursive-locking-of-p.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0352-workqueue-Fix-deadlock-due-to-recursive-locking-of-p.patch b/debian/patches-rt/0352-workqueue-Fix-deadlock-due-to-recursive-locking-of-p.patch
index 847f5978e..bb3bb03cf 100644
--- a/debian/patches-rt/0352-workqueue-Fix-deadlock-due-to-recursive-locking-of-p.patch
+++ b/debian/patches-rt/0352-workqueue-Fix-deadlock-due-to-recursive-locking-of-p.patch
@@ -1,8 +1,8 @@
From: "Brennan Lamoreaux (VMware)" <brennanlamoreaux@gmail.com>
Date: Tue, 28 Feb 2023 14:49:38 -0800
-Subject: [PATCH 352/353] workqueue: Fix deadlock due to recursive locking of
+Subject: [PATCH 352/354] workqueue: Fix deadlock due to recursive locking of
pool->lock
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=ad25c1a19c04844c75d94d93a22d5879cdcede1c
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=8ddf6c4f69cacbc7afe70679003327744ecf8e39
Upstream commit d8bb65ab70f7 ("workqueue: Use rcuwait for wq_manager_wait")
replaced the waitqueue with rcuwait in the workqueue code. This change
@@ -55,10 +55,10 @@ Signed-off-by: Daniel Wagner <wagi@monom.org>
1 file changed, 1 deletion(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index a9f3cc02bdc1..55ebdd56a5de 100644
+index 0c7033deaef2..e6e1923c88eb 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
-@@ -3394,7 +3394,6 @@ static void put_unbound_pool(struct worker_pool *pool)
+@@ -3397,7 +3397,6 @@ static void put_unbound_pool(struct worker_pool *pool)
* Because of how wq_manager_inactive() works, we will hold the
* spinlock after a successful wait.
*/