diff options
| author | aszlig <aszlig@nix.build> | 2017-11-30 13:36:16 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2017-11-30 13:36:16 +0100 |
| commit | 2dfdc52ab27d5bb5d9c0b6f0651dbfa0da3a1413 (patch) | |
| tree | e3afca5e343d26d5e4ad304139df91e3e6820b95 /modules/system | |
| parent | a01b8280507b8c0c07572661365dbb023854f437 (diff) | |
modules/bfq: Rebase patch against kernel 4.15-rc1
The patch for <= 4.14 no longer applies, because elevator_get() now has an additional argument. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/kernel/bfq/bfq-by-default-4.15.patch | 13 | ||||
| -rw-r--r-- | modules/system/kernel/bfq/default.nix | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/modules/system/kernel/bfq/bfq-by-default-4.15.patch b/modules/system/kernel/bfq/bfq-by-default-4.15.patch new file mode 100644 index 00000000..8a4666ca --- /dev/null +++ b/modules/system/kernel/bfq/bfq-by-default-4.15.patch @@ -0,0 +1,13 @@ +diff --git a/block/elevator.c b/block/elevator.c +index 7bda083d5968..8dddfaf725fc 100644 +--- a/block/elevator.c ++++ b/block/elevator.c +@@ -246,7 +246,7 @@ int elevator_init(struct request_queue *q, char *name) + */ + if (q->mq_ops) { + if (q->nr_hw_queues == 1) +- e = elevator_get(q, "mq-deadline", false); ++ e = elevator_get(q, "bfq", false); + if (!e) + return 0; + } else diff --git a/modules/system/kernel/bfq/default.nix b/modules/system/kernel/bfq/default.nix index db1eba68..32f5c008 100644 --- a/modules/system/kernel/bfq/default.nix +++ b/modules/system/kernel/bfq/default.nix @@ -11,7 +11,9 @@ in { config = lib.mkIf config.vuizvui.system.kernel.bfq.enable { boot.kernelPatches = lib.singleton { name = "bfq"; - patch = ./bfq-by-default.patch; + patch = 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 |