1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 730ef3c384ca..bc24dfb6f251 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -837,9 +837,9 @@ unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,
         unsigned long flags;
         unsigned int consumed;
 
-        local_irq_save(flags);
+        local_irq_save_nort(flags);
         consumed = ata_sff_data_xfer(dev, buf, buflen, rw);
-        local_irq_restore(flags);
+        local_irq_restore_nort(flags);
 
         return consumed;
 }
@@ -878,7 +878,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
                 unsigned long flags;
 
                 /* FIXME: use a bounce buffer */
-                local_irq_save(flags);
+                local_irq_save_nort(flags);
                 buf = kmap_atomic(page, KM_IRQ0);
 
                 /* do the actual data transfer */
@@ -886,7 +886,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
                                        do_write);
 
                 kunmap_atomic(buf, KM_IRQ0);
-                local_irq_restore(flags);
+                local_irq_restore_nort(flags);
         } else {
                 buf = page_address(page);
                 ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,
@@ -1019,7 +1019,7 @@ next_sg:
                 unsigned long flags;
 
                 /* FIXME: use bounce buffer */
-                local_irq_save(flags);
+                local_irq_save_nort(flags);
                 buf = kmap_atomic(page, KM_IRQ0);
 
                 /* do the actual data transfer */
@@ -1027,7 +1027,7 @@ next_sg:
                                                                 count, rw);
 
                 kunmap_atomic(buf, KM_IRQ0);
-                local_irq_restore(flags);
+                local_irq_restore_nort(flags);
         } else {
                 buf = page_address(page);
                 consumed = ap->ops->sff_data_xfer(dev,  buf + offset,