36 lines
1012 B
Diff
36 lines
1012 B
Diff
Subject: dm: Make rt aware
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Mon, 14 Nov 2011 23:06:09 +0100
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.12/patches-3.12.6-rt9.tar.xz
|
|
|
|
Use the BUG_ON_NORT variant for the irq_disabled() checks. RT has
|
|
interrupts legitimately enabled here as we cant deadlock against the
|
|
irq thread due to the "sleeping spinlocks" conversion.
|
|
|
|
Reported-by: Luis Claudio R. Goncalves <lclaudio@uudg.org>
|
|
Cc: stable-rt@vger.kernel.org
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
drivers/md/dm.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/md/dm.c
|
|
+++ b/drivers/md/dm.c
|
|
@@ -1813,14 +1813,14 @@ static void dm_request_fn(struct request
|
|
if (map_request(ti, clone, md))
|
|
goto requeued;
|
|
|
|
- BUG_ON(!irqs_disabled());
|
|
+ BUG_ON_NONRT(!irqs_disabled());
|
|
spin_lock(q->queue_lock);
|
|
}
|
|
|
|
goto out;
|
|
|
|
requeued:
|
|
- BUG_ON(!irqs_disabled());
|
|
+ BUG_ON_NONRT(!irqs_disabled());
|
|
spin_lock(q->queue_lock);
|
|
|
|
delay_and_out:
|