summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-07-03 08:44:34 -0500
committerSteven Rostedt <rostedt@rostedt.homelinux.com>2013-06-06 21:18:46 -0400
commit64f347ff67c657c00b9ec9bfcd83504c58a55f4a (patch)
tree4eb3b783a798cf2e934c07df173290a946f7078c
parent226258f392fa2f7bd32b15b4b859d4e3b9779143 (diff)
downloadlinux-rt-64f347ff67c657c00b9ec9bfcd83504c58a55f4a.tar.gz
mm: scatterlist dont disable irqs on RT
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--lib/scatterlist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index fadae774a20c..e2d0bf147a9b 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -479,7 +479,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);
} else
kunmap(miter->page);
@@ -519,7 +519,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;
@@ -536,7 +536,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;
}