| From d383e1fd1bb91c18e9c2005ee0b9255bf91f7dcd Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 3 Jul 2009 08:44:34 -0500 |
| Subject: [PATCH] mm: scatterlist dont disable irqs on RT |
| |
| commit a209458a0fc84eeaa483a23787667d8946a42673 in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/lib/scatterlist.c b/lib/scatterlist.c |
| index 9afa25b..584a7d0 100644 |
| --- a/lib/scatterlist.c |
| +++ b/lib/scatterlist.c |
| @@ -10,6 +10,7 @@ |
| #include <linux/slab.h> |
| #include <linux/scatterlist.h> |
| #include <linux/highmem.h> |
| +#include <linux/interrupt.h> |
| |
| /** |
| * sg_next - return the next scatterlist entry in a list |
| @@ -400,7 +401,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, KM_BIO_SRC_IRQ); |
| } else |
| kunmap(miter->page); |
| @@ -440,7 +441,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; |
| @@ -457,7 +458,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; |
| } |
| |
| -- |
| 1.7.1.1 |
| |
