diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-29 14:19:35 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-29 14:19:35 +0000 |
| commit | 25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6 (patch) | |
| tree | e036736e19c18c48637d5c84857ab34701b18783 | |
| parent | 15f77a015e4851740710347304cffe94733be54d (diff) | |
| download | nixpkgs-25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6.tar nixpkgs-25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6.tar.gz nixpkgs-25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6.tar.bz2 nixpkgs-25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6.tar.lz nixpkgs-25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6.tar.xz nixpkgs-25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6.tar.zst nixpkgs-25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6.zip | |
* Re-enable the CFQ scheduler as a builtin module (as was the case in
2.6.32). svn path=/nixpkgs/trunk/; revision=30617
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.0.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.1.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.2.nix | 5 |
4 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index e0a9a28d1bc..a6d03db9b86 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -18,6 +18,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 6474e5de4d6..557223e6260 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -20,6 +20,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 720a5fa15f2..8688d805054 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -20,6 +20,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 50174526596..0e3ace5c384 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -20,6 +20,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n |