diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-03 08:44:34 -0500 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-01-01 00:00:00 +0100 |
| commit | 798440f2e90d681120f54e358dd1097228bf2a2e (patch) | |
| tree | 62fcd22b619352d319125ad49f5947ccd4053aef /lib/scatterlist.c | |
| parent | 9da00ff11165739aeac43d8c5dacf0956695d32b (diff) | |
| download | linux-rt-798440f2e90d681120f54e358dd1097228bf2a2e.tar.gz | |
mm/scatterlist: Do not disable irqs on RT
The local_irq_save() is not only used to get things done "fast" but
also to ensure that in case of SG_MITER_ATOMIC we are in "atomic"
context for kmap_atomic(). For -RT it is enough to keep pagefault
disabled (which is currently handled by kmap_atomic()).
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'lib/scatterlist.c')
| -rw-r--r-- | lib/scatterlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index c9f2e8c6ccc9..f6d1f8899dca 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -592,7 +592,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter) flush_kernel_dcache_page(miter->page); if (miter->__flags & SG_MITER_ATOMIC) { - WARN_ON_ONCE(preemptible()); + WARN_ON_ONCE(!pagefault_disabled()); kunmap_atomic(miter->addr); } else kunmap(miter->page); @@ -637,7 +637,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, if (!sg_miter_skip(&miter, skip)) return false; - local_irq_save(flags); + local_irq_save_nort(flags); while (sg_miter_next(&miter) && offset < buflen) { unsigned int len; @@ -654,7 +654,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; } |