These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / ide / ide-taskfile.c

diff --git a/kernel/drivers/ide/ide-taskfile.c b/kernel/drivers/ide/ide-taskfile.c
index 2cecea7..be0568c 100644 (file)
--- a/kernel/drivers/ide/ide-taskfile.c
+++ b/kernel/drivers/ide/ide-taskfile.c
@@ -186,7 +186,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
            tf->command == ATA_CMD_CHK_POWER) {
                struct request *rq = hwif->rq;
 
-               if (blk_pm_request(rq))
+               if (ata_pm_request(rq))
                        ide_complete_pm_rq(drive, rq);
                else
                        ide_finish_cmd(drive, cmd, stat);
@@ -430,7 +430,7 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf,
        int error;
        int rw = !(cmd->tf_flags & IDE_TFLAG_WRITE) ? READ : WRITE;
 
-       rq = blk_get_request(drive->queue, rw, __GFP_WAIT);
+       rq = blk_get_request(drive->queue, rw, __GFP_RECLAIM);
        rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
 
        /*
@@ -441,7 +441,7 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf,
         */
        if (nsect) {
                error = blk_rq_map_kern(drive->queue, rq, buf,
-                                       nsect * SECTOR_SIZE, __GFP_WAIT);
+                                       nsect * SECTOR_SIZE, __GFP_RECLAIM);
                if (error)
                        goto put_req;
        }