| Subject: dm: Make rt aware |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Mon, 14 Nov 2011 23:06:09 +0100 |
| |
| 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(-) |
| |
| Index: linux-stable/drivers/md/dm.c |
| =================================================================== |
| --- linux-stable.orig/drivers/md/dm.c |
| +++ linux-stable/drivers/md/dm.c |
| @@ -1692,14 +1692,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: |
