Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / drivers / ata / libata-sff.c

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 051b6158d1b7f45b7116b9debc98376a9d4d240f..7ad293bef6edc6366fec357d1a5f9671e880873b 100644 (file)
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -678,9 +678,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_xfer32(dev, buf, buflen, rw);
-       local_irq_restore(flags);
+       local_irq_restore_nort(flags);
 
        return consumed;
 }
@@ -719,7 +719,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);
 
                /* do the actual data transfer */
@@ -727,7 +727,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
                                       do_write);
 
                kunmap_atomic(buf);
-               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,
@@ -864,7 +864,7 @@ next_sg:
                unsigned long flags;
 
                /* FIXME: use bounce buffer */
-               local_irq_save(flags);
+               local_irq_save_nort(flags);
                buf = kmap_atomic(page);
 
                /* do the actual data transfer */
@@ -872,7 +872,7 @@ next_sg:
                                                                count, rw);
 
                kunmap_atomic(buf);
-               local_irq_restore(flags);
+               local_irq_restore_nort(flags);
        } else {
                buf = page_address(page);
                consumed = ap->ops->sff_data_xfer(dev,  buf + offset,