machines/tishtushi: Add BFQ patch replacing CFQ

So far until version 4.7.0 I've used the BFQ patch that adds BFQ as
another I/O scheduler to the kernel. I'm using BFQ as the default
scheduler on this machine, so it makes sense to completely replace the
CFQ scheduler with the BFQ implementation.

Paolo Valente has already ported this to 4.8 according to this post:

https://groups.google.com/d/msg/bfq-iosched/RQNkbDf9rAg/DqgVDGs7AAAJ

So let's just switch to the implementation that might get mainlined
someday.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 10 insertions, 9 deletions

diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 7026fc4f..90cb1407 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -16,16 +16,17 @@ in {
       trimVer = ver: take 2 (splitString "." (replaceChars ["-"] ["."] ver));
       tooOld = trimVer linux_latest.version == trimVer linux_testing.version;
       origKernel = if tooOld then linux_latest else linux_testing;
-      bfqsched = pkgs.vuizvui.kernelPatches.bfqsched // {
-        extraConfig = ''
-          IOSCHED_BFQ y
-          DEFAULT_BFQ y
-          DEFAULT_CFQ n
-          DEFAULT_IOSCHED "bfq"
-        '';
-      };
       kernel = origKernel.override (origArgs: {
-        kernelPatches = origArgs.kernelPatches ++ singleton bfqsched;
+        kernelPatches = origArgs.kernelPatches ++ singleton {
+          name = "bfqsched";
+          patch = pkgs.fetchpatch {
+            name = "cfq-replacement.patch";
+            url = "https://github.com/linusw/linux-bfq/compare/"
+                + "29b4817d4018df78086157ea3a55c1d9424a7cfc"
+                + "...cfq_replacement-logical.patch";
+            sha256 = "1b3n287r31g0sn85f88dmd00wlsccnm90mr5sr8lj4g1fvnfswqv";
+          };
+        };
       });
     in linuxPackagesFor kernel kernelPackages;