Merge tag 'ktest-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 293c5c8..440699c 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -621,7 +621,8 @@ static inline bool elv_support_iosched(struct request_queue *q)
  */
 static struct elevator_type *elevator_get_default(struct request_queue *q)
 {
-       if (q->nr_hw_queues != 1)
+       if (q->nr_hw_queues != 1 &&
+                       !blk_mq_is_sbitmap_shared(q->tag_set->flags))
                return NULL;
 
        return elevator_get(q, "mq-deadline", false);