1 From ad5ffbd6f60c58834887e3fe75a40ca770ff415e Mon Sep 17 00:00:00 2001
2 From: Thomas Gleixner <tglx@linutronix.de>
3 Date: Fri, 3 Jul 2009 08:44:34 -0500
4 Subject: [PATCH 045/366] mm/scatterlist: Do not disable irqs on RT
6 The local_irq_save() is not only used to get things done "fast" but
7 also to ensure that in case of SG_MITER_ATOMIC we are in "atomic"
8 context for kmap_atomic(). For -RT it is enough to keep pagefault
9 disabled (which is currently handled by kmap_atomic()).
11 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
13 lib/scatterlist.c | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
16 diff --git a/lib/scatterlist.c b/lib/scatterlist.c
17 index bafa993..ebe3b7e 100644
18 --- a/lib/scatterlist.c
19 +++ b/lib/scatterlist.c
20 @@ -620,7 +620,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
21 flush_kernel_dcache_page(miter->page);
23 if (miter->__flags & SG_MITER_ATOMIC) {
24 - WARN_ON_ONCE(preemptible());
25 + WARN_ON_ONCE(!pagefault_disabled());
26 kunmap_atomic(miter->addr);
29 @@ -664,7 +664,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
30 if (!sg_miter_skip(&miter, skip))
33 - local_irq_save(flags);
34 + local_irq_save_nort(flags);
36 while (sg_miter_next(&miter) && offset < buflen) {
38 @@ -681,7 +681,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
40 sg_miter_stop(&miter);
42 - local_irq_restore(flags);
43 + local_irq_restore_nort(flags);
46 EXPORT_SYMBOL(sg_copy_buffer);