From 58f0b7ada55ce0416d2a35e81ac748da88284a74 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 Jun 2014 15:12:28 +0200 Subject: 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 --- machines/mmrnmhrm-kconf.nix | 4 ++-- 1 file 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"; -- cgit 1.4.1