| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 3 Jul 2009 08:44:34 -0500 |
| Subject: 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(-) |
| |
| --- a/lib/scatterlist.c |
| +++ b/lib/scatterlist.c |
| @@ -533,7 +533,7 @@ void sg_miter_stop(struct sg_mapping_ite |
| 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); |
| @@ -573,7 +573,7 @@ static size_t sg_copy_buffer(struct scat |
| |
| 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; |
| @@ -590,7 +590,7 @@ static size_t sg_copy_buffer(struct scat |
| |
| sg_miter_stop(&miter); |
| |
| - local_irq_restore(flags); |
| + local_irq_restore_nort(flags); |
| return offset; |
| } |
| |
