42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From 220e1091df48b1a9d5f780a2287555209651d752 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Fri, 3 Jul 2009 08:44:34 -0500
|
|
Subject: [PATCH 090/293] mm: scatterlist dont disable irqs on RT
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
lib/scatterlist.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
|
|
index 4ceb05d..181f364 100644
|
|
--- a/lib/scatterlist.c
|
|
+++ b/lib/scatterlist.c
|
|
@@ -423,7 +423,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
|
|
flush_kernel_dcache_page(miter->page);
|
|
|
|
if (miter->__flags & SG_MITER_ATOMIC) {
|
|
- WARN_ON(!irqs_disabled());
|
|
+ WARN_ON_NONRT(!irqs_disabled());
|
|
kunmap_atomic(miter->addr, KM_BIO_SRC_IRQ);
|
|
} else
|
|
kunmap(miter->page);
|
|
@@ -463,7 +463,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents,
|
|
|
|
sg_miter_start(&miter, sgl, nents, sg_flags);
|
|
|
|
- local_irq_save(flags);
|
|
+ local_irq_save_nort(flags);
|
|
|
|
while (sg_miter_next(&miter) && offset < buflen) {
|
|
unsigned int len;
|
|
@@ -480,7 +480,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents,
|
|
|
|
sg_miter_stop(&miter);
|
|
|
|
- local_irq_restore(flags);
|
|
+ local_irq_restore_nort(flags);
|
|
return offset;
|
|
}
|
|
|