diff options
| author | aszlig <aszlig@nix.build> | 2019-12-08 15:39:23 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2019-12-08 15:39:23 +0100 |
| commit | 91efb768b9333ff50acba3ad4b4b8cf1a04bbf87 (patch) | |
| tree | da3411cb2b9b5201125d5f039933b001b466e7bc /modules/system | |
| parent | 55835a5cb0f5c088c31377e34bda5702c3830bf2 (diff) | |
modules/bfq: Rebase patch against kernel 5.4
The patch no longer applies because the default elevator initalisation has been refactored a bit[1] in kernel 5.4. Content-wise our patch is still the same. [1]: https://github.com/torvalds/linux/commit/a0958ba7fcdc316e3900f8d2afda519850d60985 Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/kernel/bfq/bfq-by-default-5.4.patch | 13 | ||||
| -rw-r--r-- | modules/system/kernel/bfq/default.nix | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/modules/system/kernel/bfq/bfq-by-default-5.4.patch b/modules/system/kernel/bfq/bfq-by-default-5.4.patch new file mode 100644 index 00000000..7f06ec41 --- /dev/null +++ b/modules/system/kernel/bfq/bfq-by-default-5.4.patch @@ -0,0 +1,13 @@ +diff --git a/block/elevator.c b/block/elevator.c +index 4eab3d70e880..7ea8f9d34e86 100644 +--- a/block/elevator.c ++++ b/block/elevator.c +@@ -631,7 +631,7 @@ static struct elevator_type *elevator_get_default(struct request_queue *q) + if (q->nr_hw_queues != 1) + return NULL; + +- return elevator_get(q, "mq-deadline", false); ++ return elevator_get(q, "bfq", false); + } + + /* diff --git a/modules/system/kernel/bfq/default.nix b/modules/system/kernel/bfq/default.nix index ed83ca3f..a4b593ee 100644 --- a/modules/system/kernel/bfq/default.nix +++ b/modules/system/kernel/bfq/default.nix @@ -12,7 +12,8 @@ in { boot.kernelPatches = lib.singleton { name = "bfq"; patch = - if versionAtLeast version "4.18" then ./bfq-by-default-4.18.patch + if versionAtLeast version "5.4" then ./bfq-by-default-5.4.patch + else if versionAtLeast version "4.18" then ./bfq-by-default-4.18.patch else if versionAtLeast version "4.15" then ./bfq-by-default-4.15.patch else ./bfq-by-default.patch; extraConfig = '' |