ide, scsi: Tell the block layer at request allocation time about preempt requests

[linux-2.6-microblaze.git] / drivers / ide / ide-pm.c

diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index 544f02d..f56d742 100644 (file)
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -89,9 +89,9 @@ int generic_ide_resume(struct device *dev)
        }
 
        memset(&rqpm, 0, sizeof(rqpm));
-       rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM);
+       rq = blk_get_request_flags(drive->queue, REQ_OP_DRV_IN,
+                                  BLK_MQ_REQ_PREEMPT);
        ide_req(rq)->type = ATA_PRIV_PM_RESUME;
-       rq->rq_flags |= RQF_PREEMPT;
        rq->special = &rqpm;
        rqpm.pm_step = IDE_PM_START_RESUME;
        rqpm.pm_state = PM_EVENT_ON;