diff options
| author | Jens Axboe <axboe@fb.com> | 2017-01-27 15:08:31 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-27 15:08:31 -0700 |
| commit | f924ba70c1b12706c6679d793202e8f4c125f7ae (patch) | |
| tree | 978f8f56ccfa7c6fdb4be4ac6e498d73d44bf14f /drivers/nvme | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| parent | 400f73b23f457a82288814e21af57dbc9f3f2afd (diff) | |
| download | linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.tar.gz linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.tar.bz2 linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.zip | |
Merge branch 'for-4.11/block' into for-4.11/rq-refactor
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 3faefabf339c..7103bce4ba4f 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1178,6 +1178,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev) dev->admin_tagset.timeout = ADMIN_TIMEOUT; dev->admin_tagset.numa_node = dev_to_node(dev->dev); dev->admin_tagset.cmd_size = nvme_cmd_size(dev); + dev->admin_tagset.flags = BLK_MQ_F_NO_SCHED; dev->admin_tagset.driver_data = dev; if (blk_mq_alloc_tag_set(&dev->admin_tagset)) |