| From e806b508ac449153e4fe0cdc95bb657c7c778e96 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Mon, 14 Nov 2011 23:06:09 +0100 |
| Subject: [PATCH 228/274] dm: Make rt aware |
| |
| 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(-) |
| |
| diff --git a/drivers/md/dm.c b/drivers/md/dm.c |
| index 9ff3019..001c743 100644 |
| --- a/drivers/md/dm.c |
| +++ b/drivers/md/dm.c |
| @@ -1670,14 +1670,14 @@ static void dm_request_fn(struct request_queue *q) |
| 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: |
| -- |
| 1.7.10.4 |
| |
