diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-04-22 08:26:59 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-04-22 08:26:59 +0200 |
| commit | b362d750cc4940558e0afae721c7f74bfb768f0c (patch) | |
| tree | 5051b1a9fdf62822e866e412414f2bf04a3922cc | |
| parent | 6c224e49345abeb7e4502df6d337b5127f08e5d0 (diff) | |
Enable BFQ scheduler on all machines by default.
This adds the kernel patch to all machines and uses it as the default scheduler. Let's see when I need to scream at the edit of a commit message again, because the disk is busy and the editor is waiting for I/O. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | machines/dnyarri-kconf.nix | 6 | ||||
| -rw-r--r-- | machines/dnyarri.nix | 1 | ||||
| -rw-r--r-- | machines/mmrnmhrm-kconf.nix | 6 | ||||
| -rw-r--r-- | machines/mmrnmhrm.nix | 1 |
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; }; |