Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  sg: disable interrupts inside sg_copy_buffer

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 876ba6d5b670..8d2688ff1352 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -422,9 +422,12 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents,
 {
         unsigned int offset = 0;
         struct sg_mapping_iter miter;
+        unsigned long flags;
 
         sg_miter_start(&miter, sgl, nents, SG_MITER_ATOMIC);
 
+        local_irq_save(flags);
+
         while (sg_miter_next(&miter) && offset < buflen) {
                 unsigned int len;
 
@@ -442,6 +445,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents,
 
         sg_miter_stop(&miter);
 
+        local_irq_restore(flags);
         return offset;
 }