diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2010-01-20 06:24:29 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2010-01-20 06:24:29 +0000 |
commit | d2795e889ca7a44efdb27be0612da406b0f45128 (patch) | |
tree | ce26dc540afdc4be6e0e0a8a21f485800cb037b8 /pkgs/os-specific/linux | |
parent | ef4198ec8df7ab61950c4adfcf8b027fbf4af374 (diff) |
Force CFS in zen-kernel not specified as BFS
svn path=/nixpkgs/trunk/; revision=19557
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/kernel/config-blocks.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/config-blocks.nix b/pkgs/os-specific/linux/kernel/config-blocks.nix index b7ae587569eb3..06564b506727d 100644 --- 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 + ''; } diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix index c5dc6a3b18ba9..ec52d701df5a7 100644 --- 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 = '' |