release 6.11.6
This commit is contained in:
@@ -10,14 +10,14 @@ Subject: ZEN: INTERACTIVE: Use BFQ as the elevator for SQ devices
|
||||
|
||||
--- a/block/elevator.c
|
||||
+++ b/block/elevator.c
|
||||
@@ -569,7 +569,11 @@ static struct elevator_type *elevator_ge
|
||||
@@ -568,7 +568,11 @@ static struct elevator_type *elevator_ge
|
||||
!blk_mq_is_shared_tags(q->tag_set->flags))
|
||||
return NULL;
|
||||
|
||||
+#if defined(CONFIG_ZEN_INTERACTIVE) && defined(CONFIG_IOSCHED_BFQ)
|
||||
+ return elevator_find_get(q, "bfq");
|
||||
+ return elevator_find_get("bfq");
|
||||
+#else
|
||||
return elevator_find_get(q, "mq-deadline");
|
||||
return elevator_find_get("mq-deadline");
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
@@ -10,20 +10,20 @@ Subject: ZEN: INTERACTIVE: Use Kyber as the elevator for MQ devices
|
||||
|
||||
--- a/block/elevator.c
|
||||
+++ b/block/elevator.c
|
||||
@@ -567,7 +567,13 @@ static struct elevator_type *elevator_ge
|
||||
@@ -566,7 +566,13 @@ static struct elevator_type *elevator_ge
|
||||
|
||||
if (q->nr_hw_queues != 1 &&
|
||||
!blk_mq_is_shared_tags(q->tag_set->flags))
|
||||
+#if defined(CONFIG_ZEN_INTERACTIVE) && defined(CONFIG_MQ_IOSCHED_KYBER)
|
||||
+ return elevator_find_get(q, "kyber");
|
||||
+ return elevator_find_get("kyber");
|
||||
+#elif defined(CONFIG_ZEN_INTERACTIVE)
|
||||
+ return elevator_find_get(q, "mq-deadline");
|
||||
+ return elevator_find_get("mq-deadline");
|
||||
+#else
|
||||
return NULL;
|
||||
+#endif
|
||||
|
||||
#if defined(CONFIG_ZEN_INTERACTIVE) && defined(CONFIG_IOSCHED_BFQ)
|
||||
return elevator_find_get(q, "bfq");
|
||||
return elevator_find_get("bfq");
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -143,6 +143,7 @@ config ZEN_INTERACTIVE
|
||||
|
Reference in New Issue
Block a user