From 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 19:45:38 +0200 Subject: Merging debian version 5.10.216-1. Signed-off-by: Daniel Baumann --- .../0230-block-mq-do-not-invoke-preempt_disable.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/patches-rt/0230-block-mq-do-not-invoke-preempt_disable.patch') diff --git a/debian/patches-rt/0230-block-mq-do-not-invoke-preempt_disable.patch b/debian/patches-rt/0230-block-mq-do-not-invoke-preempt_disable.patch index d1f8234d5..721c8817d 100644 --- a/debian/patches-rt/0230-block-mq-do-not-invoke-preempt_disable.patch +++ b/debian/patches-rt/0230-block-mq-do-not-invoke-preempt_disable.patch @@ -1,8 +1,8 @@ -From 0470292c7761cc1cd2847e60b43b202b1be7ee29 Mon Sep 17 00:00:00 2001 +From 6c7fb806f2b6273b132d75f8003c552ea5806000 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Tue, 14 Jul 2015 14:26:34 +0200 Subject: [PATCH 230/323] block/mq: do not invoke preempt_disable() -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz preempt_disable() and get_cpu() don't play well together with the sleeping locks it tries to allocate later. @@ -14,10 +14,10 @@ Signed-off-by: Sebastian Andrzej Siewior 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c -index a6618bf45992..37466b3a4ba5 100644 +index 927b1dc3476a2..a027c6734e9a2 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c -@@ -1575,14 +1575,14 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async, +@@ -1591,14 +1591,14 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async, return; if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) { @@ -36,5 +36,5 @@ index a6618bf45992..37466b3a4ba5 100644 kblockd_mod_delayed_work_on(blk_mq_hctx_next_cpu(hctx), &hctx->run_work, -- -2.43.0 +2.44.0 -- cgit v1.2.3