From 5ad6cd2fe58661ad5404da8e7a0eb77d24b834c8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 Jun 2018 15:37:33 +0200 Subject: 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 --- modules/system/kernel/bfq/bfq-by-default-4.18.patch | 13 +++++++++++++ modules/system/kernel/bfq/default.nix | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 modules/system/kernel/bfq/bfq-by-default-4.18.patch (limited to 'modules') 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 -- cgit 1.4.1