Force CFS in zen-kernel not specified as BFS

svn path=/nixpkgs/trunk/; revision=19557
2010-01-20 06:24:29 +00:00
parent ef4198ec8d
commit d2795e889c
2 changed files with 7 additions and 1 deletions
--- a/pkgs/os-specific/linux/kernel/config-blocks.nix
+++ b/pkgs/os-specific/linux/kernel/config-blocks.nix
@@ -254,4 +254,10 @@ rec {
        HZ_300 y
        HZ 300
      '';
+
+      forceCFSched = ''
+        SCHED_CFS? y
+        SCHED_BFS? y
+        NO_HZ? y
+      '';
 }
--- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
@@ -57,7 +57,7 @@ import ../kernel/generic.nix (
      ${blockDevices}
      ${bluetooth}
      ${misc}
-      ${if stdenv.lib.attrByPath ["features" "ckSched"] false args then bfsched else ""}
+      ${if stdenv.lib.attrByPath ["features" "ckSched"] false args then bfsched else forceCFSched}
    '';

    preConfigure = ''