Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / drivers / scsi / qla2xxx / qla_isr.c

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 987f1c729e9cd588c13219269b11d84d2ca6f183..a2090f6403976e86b3c6397bf50e79cfa6ebea6e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1828,7 +1828,7 @@ qla2x00_handle_dif_error(srb_t *sp, struct sts_entry_24xx *sts24)
                if (scsi_prot_sg_count(cmd)) {
                        uint32_t i, j = 0, k = 0, num_ent;
                        struct scatterlist *sg;
-                       struct sd_dif_tuple *spt;
+                       struct t10_pi_tuple *spt;
 
                        /* Patch the corresponding protection tags */
                        scsi_for_each_prot_sg(cmd, sg,
@@ -3125,7 +3125,11 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
                * kref_put().
                */
                kref_get(&qentry->irq_notify.kref);
+#ifdef CONFIG_PREEMPT_RT_BASE
+               swork_queue(&qentry->irq_notify.swork);
+#else
                schedule_work(&qentry->irq_notify.work);
+#endif
        }
 
        /*