diff options
| author | aszlig <aszlig@nix.build> | 2018-06-22 15:37:33 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-06-22 15:37:33 +0200 |
| commit | 5ad6cd2fe58661ad5404da8e7a0eb77d24b834c8 (patch) | |
| tree | e7ce83614fb91e0e9177d25bb296d4b37f3eec53 /modules/system | |
| parent | c08681d0afb326b5bc9b323b9b964249dfe29706 (diff) | |
modules/bfq: Rebase patch against kernel 4.18-rc1
The patch no longer applies with this kernel version because the patch context has changed. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/kernel/bfq/bfq-by-default-4.18.patch | 13 | ||||
| -rw-r--r-- | modules/system/kernel/bfq/default.nix | 7 |
2 files changed, 17 insertions, 3 deletions
diff --git a/modules/system/kernel/bfq/bfq-by-default-4.18.patch b/modules/system/kernel/bfq/bfq-by-default-4.18.patch new file mode 100644 index 00000000..5ece12cb --- /dev/null +++ b/modules/system/kernel/bfq/bfq-by-default-4.18.patch @@ -0,0 +1,13 @@ +diff --git a/block/elevator.c b/block/elevator.c +index fa828b5bfd4b..cdd582a18e50 100644 +--- a/block/elevator.c ++++ b/block/elevator.c +@@ -994,7 +994,7 @@ int elevator_init_mq(struct request_queue *q) + if (unlikely(q->elevator)) + goto out_unlock; + +- e = elevator_get(q, "mq-deadline", false); ++ e = elevator_get(q, "bfq", false); + if (!e) + goto out_unlock; + diff --git a/modules/system/kernel/bfq/default.nix b/modules/system/kernel/bfq/default.nix index 32f5c008..cfd0dbcf 100644 --- a/modules/system/kernel/bfq/default.nix +++ b/modules/system/kernel/bfq/default.nix @@ -11,9 +11,10 @@ in { config = lib.mkIf config.vuizvui.system.kernel.bfq.enable { boot.kernelPatches = lib.singleton { name = "bfq"; - patch = if versionAtLeast version "4.15" - then ./bfq-by-default-4.15.patch - else ./bfq-by-default.patch; + patch = + 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 = '' SCSI_MQ_DEFAULT y DM_MQ_DEFAULT y |