summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/block-mq-drop-preempt-disable.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/block-mq-drop-preempt-disable.patch')
-rw-r--r--debian/patches-rt/block-mq-drop-preempt-disable.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/block-mq-drop-preempt-disable.patch b/debian/patches-rt/block-mq-drop-preempt-disable.patch
index 401459684..0930ac9e8 100644
--- a/debian/patches-rt/block-mq-drop-preempt-disable.patch
+++ b/debian/patches-rt/block-mq-drop-preempt-disable.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 14 Jul 2015 14:26:34 +0200
Subject: block/mq: do not invoke preempt_disable()
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2.17-rt9.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz
preempt_disable() and get_cpu() don't play well together with the sleeping
locks it tries to allocate later.
@@ -14,7 +14,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
-@@ -604,7 +604,7 @@ static void __blk_mq_complete_request(st
+@@ -611,7 +611,7 @@ static void __blk_mq_complete_request(st
return;
}
@@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (!test_bit(QUEUE_FLAG_SAME_FORCE, &q->queue_flags))
shared = cpus_share_cache(cpu, ctx->cpu);
-@@ -616,7 +616,7 @@ static void __blk_mq_complete_request(st
+@@ -623,7 +623,7 @@ static void __blk_mq_complete_request(st
} else {
q->mq_ops->complete(rq);
}
@@ -32,7 +32,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
}
static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx)
-@@ -1456,14 +1456,14 @@ static void __blk_mq_delay_run_hw_queue(
+@@ -1466,14 +1466,14 @@ static void __blk_mq_delay_run_hw_queue(
return;
if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {