diff options
| author |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-09-07 12:12:43 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-09-07 12:12:43 -0700 |
| commit | 2441500a41a9b17ff657626eb81972f62bc8cc5a (patch) | |
| tree | a73d114149de8daa1da3713d4048930ba7421384 /drivers/scsi/scsi.c | |
| parent | scsi: scsi-mq: Always unprepare before requeuing a request (diff) | |
| parent | scsi: qla2xxx: Fix an integer overflow in sysfs code (diff) | |
| download | linux-dev-2441500a41a9b17ff657626eb81972f62bc8cc5a.tar.xz linux-dev-2441500a41a9b17ff657626eb81972f62bc8cc5a.zip | |
Merge branch 'fixes' into misc
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index d201ebcf4544..a7e4fba724b7 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -780,7 +780,11 @@ MODULE_LICENSE("GPL"); module_param(scsi_logging_level, int, S_IRUGO|S_IWUSR); MODULE_PARM_DESC(scsi_logging_level, "a bit mask of logging levels"); +#ifdef CONFIG_SCSI_MQ_DEFAULT bool scsi_use_blk_mq = true; +#else +bool scsi_use_blk_mq = false; +#endif module_param_named(use_blk_mq, scsi_use_blk_mq, bool, S_IWUSR | S_IRUGO); static int __init init_scsi(void) |