diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-22 13:19:45 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-22 13:19:45 -0700 |
| commit | b86dd815ff74ab9eda474d1c28428ac0db2c3032 (patch) | |
| tree | d2492456261c6394b10ec03e53a6d75180986ef6 /block/blk-mq-sched.c | |
| parent | eed64951f15d63beac75e0f848ac03c14f8a4a6c (diff) | |
| download | linux-stable-b86dd815ff74ab9eda474d1c28428ac0db2c3032.tar.gz linux-stable-b86dd815ff74ab9eda474d1c28428ac0db2c3032.tar.bz2 linux-stable-b86dd815ff74ab9eda474d1c28428ac0db2c3032.zip | |
block: get rid of blk-mq default scheduler choice Kconfig entries
The wording in the entries were poor and not understandable
by even deities. Kill the selection for default block scheduler,
and impose a policy with sane defaults.
Architected-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-mq-sched.c')
| -rw-r--r-- | block/blk-mq-sched.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 9e8d6795a8c1..c14f92308244 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -498,15 +498,6 @@ int blk_mq_sched_init(struct request_queue *q) { int ret; -#if defined(CONFIG_DEFAULT_SQ_NONE) - if (q->nr_hw_queues == 1) - return 0; -#endif -#if defined(CONFIG_DEFAULT_MQ_NONE) - if (q->nr_hw_queues > 1) - return 0; -#endif - mutex_lock(&q->sysfs_lock); ret = elevator_init(q, NULL); mutex_unlock(&q->sysfs_lock); |