From a593492d4f6b9cde1e3a8e7d710d5d10b03b7718 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 14 Sep 2009 21:56:31 +0000 Subject: [PATCH] Add a version of Zen kernel with Con Kolivas' BFS scheduler svn path=/nixpkgs/trunk/; revision=17142 --- pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 1fb33fdc263..6468542f765 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 @@ -62,7 +62,12 @@ in killOption CONFIG_ACPI_CUSTOM_DSDT_INITRD killOption CONFIG_DEVTMPFS killOption CONFIG_DEVTMPFS_MOUNT - + '' + + (if a.lib.attrByPath ["ckSched"] false a then '' + killOption CONFIG_CPU_CFS + setOptionYes CONFIG_CPU_BFS + ''else "") + + '' cp .config ${config} ''; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd3e4d4657c..dddbe2b0ce5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5331,6 +5331,10 @@ let lib builderDefs; }; + kernel_2_6_31_zen0_bfs = kernel_2_6_31_zen0.override { + ckSched = true; + }; + /* Kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages