about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-06-03 15:12:28 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-06-03 15:12:28 +0200
commit58f0b7ada55ce0416d2a35e81ac748da88284a74 (patch)
tree67a385df99de7b3e364c8065f1668e7916c235f4 /machines
parent733ce206a169966943e59a116df6ac6595d2def9 (diff)
mmrnmhrm: Make CFQ the default scheduler again.
BFQ doesn't seem to play nice with btrfs (deadlocks), so I'm disabling
it at boot time for now until the issue is either resolved or I have
time to debug this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
-rw-r--r--machines/mmrnmhrm-kconf.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index ed7e8d9f..264eaf06 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -210,10 +210,10 @@
   "CONFIG_IOSCHED_DEADLINE" = "y";
   "CONFIG_IOSCHED_CFQ" = "y";
   "CONFIG_CFQ_GROUP_IOSCHED" = "y";
+  "CONFIG_DEFAULT_CFQ" = "y";
   "CONFIG_IOSCHED_BFQ" = "y";
   "CONFIG_CGROUP_BFQIO" = "y";
-  "CONFIG_DEFAULT_BFQ" = "y";
-  "CONFIG_DEFAULT_IOSCHED" = "bfq";
+  "CONFIG_DEFAULT_IOSCHED" = "cfq";
   "CONFIG_PREEMPT_NOTIFIERS" = "y";
   "CONFIG_PADATA" = "y";
   "CONFIG_ASN1" = "m";