about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/dnyarri-kconf.nix6
-rw-r--r--machines/dnyarri.nix1
-rw-r--r--machines/mmrnmhrm-kconf.nix6
-rw-r--r--machines/mmrnmhrm.nix1
4 files changed, 10 insertions, 4 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix
index df0cc7c4..a6b18992 100644
--- a/machines/dnyarri-kconf.nix
+++ b/machines/dnyarri-kconf.nix
@@ -209,9 +209,11 @@
   "CONFIG_IOSCHED_NOOP" = "y";
   "CONFIG_IOSCHED_DEADLINE" = "y";
   "CONFIG_IOSCHED_CFQ" = "y";
+  "CONFIG_IOSCHED_BFQ" = "y";
   "CONFIG_CFQ_GROUP_IOSCHED" = "y";
-  "CONFIG_DEFAULT_CFQ" = "y";
-  "CONFIG_DEFAULT_IOSCHED" = "cfq";
+  "CONFIG_CGROUP_BFQIO" = "y";
+  "CONFIG_DEFAULT_BFQ" = "y";
+  "CONFIG_DEFAULT_IOSCHED" = "bfq";
   "CONFIG_PREEMPT_NOTIFIERS" = "y";
   "CONFIG_PADATA" = "y";
   "CONFIG_ASN1" = "y";
diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix
index efbebb8b..3d691824 100644
--- a/machines/dnyarri.nix
+++ b/machines/dnyarri.nix
@@ -45,6 +45,7 @@ with import ../lib;
     linuxAszlig = pkgs.buildLinux {
       inherit (pkgs.kernelSourceAszlig) version src;
 
+      kernelPatches = singleton pkgs.aszligKernelPatches.bfqsched;
       configfile = pkgs.substituteAll {
         name = "aszlig-with-firmware.kconf";
         src = generateKConf (import ./dnyarri-kconf.nix);
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 265d28f3..4a8cf0f7 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -210,9 +210,11 @@
   "CONFIG_IOSCHED_NOOP" = "y";
   "CONFIG_IOSCHED_DEADLINE" = "y";
   "CONFIG_IOSCHED_CFQ" = "y";
+  "CONFIG_IOSCHED_BFQ" = "y";
   "CONFIG_CFQ_GROUP_IOSCHED" = "y";
-  "CONFIG_DEFAULT_CFQ" = "y";
-  "CONFIG_DEFAULT_IOSCHED" = "cfq";
+  "CONFIG_CGROUP_BFQIO" = "y";
+  "CONFIG_DEFAULT_BFQ" = "y";
+  "CONFIG_DEFAULT_IOSCHED" = "bfq";
   "CONFIG_PREEMPT_NOTIFIERS" = "y";
   "CONFIG_PADATA" = "y";
   "CONFIG_ASN1" = "m";
diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix
index 926f8297..1116dbe9 100644
--- a/machines/mmrnmhrm.nix
+++ b/machines/mmrnmhrm.nix
@@ -10,6 +10,7 @@ with import ../lib;
     linuxAszlig = pkgs.buildLinux {
       inherit (pkgs.kernelSourceAszlig) version src;
 
+      kernelPatches = singleton pkgs.aszligKernelPatches.bfqsched;
       configfile = generateKConf (import ./mmrnmhrm-kconf.nix);
       allowImportFromDerivation = true;
     };