diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2017-07-20 00:05:54 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2017-07-20 00:05:54 +0200 |
| commit | b715402838a94ada184a44db84b32e4f06fa7d01 (patch) | |
| tree | aaef7d6100c6182d0c75b9214c198e019153dd27 /modules/system | |
| parent | 48a9c6db6d985ebff7c00676c29ad50d7d1cee6c (diff) | |
bfq: Remove SCSI_MQ_DEFAULT option for kernel 4.13
This has been removed upstream and is no longer needed, see commit torvalds/linux@5c279bd9e40624f4ab6e688671026d6005b066fa. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/kernel/bfq/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/system/kernel/bfq/default.nix b/modules/system/kernel/bfq/default.nix index 064179cf..a6e7e4d1 100644 --- a/modules/system/kernel/bfq/default.nix +++ b/modules/system/kernel/bfq/default.nix @@ -1,6 +1,9 @@ { config, lib, ... }: -{ +let + inherit (config.boot.kernelPackages.kernel) version; + inherit (lib) optionalString versionAtLeast versionOlder; +in { options.vuizvui.system.kernel.bfq = { enable = lib.mkEnableOption "Enable the BFQ scheduler by default"; }; @@ -10,7 +13,7 @@ name = "bfq"; patch = ./bfq-by-default.patch; extraConfig = '' - SCSI_MQ_DEFAULT y + ${optionalString (versionOlder version "4.13") "SCSI_MQ_DEFAULT y"} DM_MQ_DEFAULT y IOSCHED_BFQ y BFQ_GROUP_IOSCHED y @@ -20,8 +23,7 @@ vuizvui.requiresTests = lib.singleton ["vuizvui" "system" "kernel" "bfq"]; assertions = lib.singleton { - assertion = - lib.versionAtLeast config.boot.kernelPackages.kernel.version "4.12"; + assertion = versionAtLeast version "4.12"; message = "The BFQ scheduler in conjunction with blk-mq requires " + "at least kernel 4.12."; |