2012-06-17 19:52:06 +00:00
|
|
|
From cbc17e6d10850202cd154a144b0540cc7b19996b Mon Sep 17 00:00:00 2001
|
2011-11-20 00:01:55 +00:00
|
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
Date: Fri, 3 Jul 2009 08:44:34 -0500
|
2012-06-17 19:52:06 +00:00
|
|
|
Subject: [073/254] mm: scatterlist dont disable irqs on RT
|
2011-11-20 00:01:55 +00:00
|
|
|
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
---
|
|
|
|
lib/scatterlist.c | 6 +++---
|
|
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
2012-06-17 19:52:06 +00:00
|
|
|
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
|
|
|
|
index 6096e89..4becb6d 100644
|
|
|
|
--- a/lib/scatterlist.c
|
|
|
|
+++ b/lib/scatterlist.c
|
|
|
|
@@ -423,7 +423,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
|
2011-11-20 00:01:55 +00:00
|
|
|
flush_kernel_dcache_page(miter->page);
|
|
|
|
|
|
|
|
if (miter->__flags & SG_MITER_ATOMIC) {
|
|
|
|
- WARN_ON(!irqs_disabled());
|
|
|
|
+ WARN_ON_NONRT(!irqs_disabled());
|
2012-06-04 21:20:09 +00:00
|
|
|
kunmap_atomic(miter->addr);
|
2011-11-20 00:01:55 +00:00
|
|
|
} else
|
|
|
|
kunmap(miter->page);
|
2012-06-17 19:52:06 +00:00
|
|
|
@@ -463,7 +463,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents,
|
2011-11-20 00:01:55 +00:00
|
|
|
|
|
|
|
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;
|
2012-06-17 19:52:06 +00:00
|
|
|
@@ -480,7 +480,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents,
|
2011-11-20 00:01:55 +00:00
|
|
|
|
|
|
|
sg_miter_stop(&miter);
|
|
|
|
|
|
|
|
- local_irq_restore(flags);
|
|
|
|
+ local_irq_restore_nort(flags);
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|