Update feature set for Zen kernel; also tune HZ settings for BFS scheduler (didn't boot for me last time)

svn path=/nixpkgs/trunk/; revision=17151

1 files changed, 9 insertions, 0 deletions

diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
index 6468542f765..366ad7d6c74 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
@@ -11,6 +11,7 @@ in
   features = {
     iwlwifi = true;
     zen = true;
+    fbConDecor = true;
   };
 
   extraMeta = {
@@ -33,6 +34,10 @@ in
       sed -re 's/^# ('"$1"') is not set/\1=y/' -i .config
       sed -re "1i$1=y" -i .config
     }
+    setOptionVal () {
+      sed -re 's/^('"$1"')=.*/\1='"$2"'/' -i .config
+      sed -re "1i$1=$2" -i .config
+    }
 
     make allmodconfig
 
@@ -66,6 +71,10 @@ in
   (if a.lib.attrByPath ["ckSched"] false a then ''
     killOption CONFIG_CPU_CFS
     setOptionYes CONFIG_CPU_BFS
+    killOption CONFIG_NO_HZ
+    killOption CONFIG_HZ_1000
+    setOptionYes CONFIG_HZ_250
+    setOptionVal CONFIG_HZ 250
   ''else "") +
   ''
     cp .config ${config}