diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-04 16:37:42 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-04 17:10:47 +0100 |
| commit | 26da67ff734385eb53763d8b70aa5b0126a209f6 (patch) | |
| tree | 8607cf6e57bf06fa74d3745d99f50320689265bd /pkgs/os-specific/linux/kernel | |
| parent | 13764f0b0f610fde990343be7851a6818bb1b32a (diff) | |
| download | nixlib-26da67ff734385eb53763d8b70aa5b0126a209f6.tar nixlib-26da67ff734385eb53763d8b70aa5b0126a209f6.tar.gz nixlib-26da67ff734385eb53763d8b70aa5b0126a209f6.tar.bz2 nixlib-26da67ff734385eb53763d8b70aa5b0126a209f6.tar.lz nixlib-26da67ff734385eb53763d8b70aa5b0126a209f6.tar.xz nixlib-26da67ff734385eb53763d8b70aa5b0126a209f6.tar.zst nixlib-26da67ff734385eb53763d8b70aa5b0126a209f6.zip | |
Kernel config: Separate power management and debugging
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0843ecf9bb83..7f7c0bd96098 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -3,19 +3,9 @@ with stdenv.lib; '' - # Power management and debugging. + # Debugging. DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - ${optionalString (versionOlder version "3.19") '' - PM_RUNTIME y - ''} - ${optionalString (versionAtLeast version "3.10") '' - X86_INTEL_PSTATE y - ''} TIMER_STATS y - ${optionalString (versionOlder version "3.10") '' - USB_SUSPEND y - ''} BACKTRACE_SELF_TEST n CPU_NOTIFIER_ERROR_INJECT? n DEBUG_DEVRES n @@ -28,6 +18,18 @@ with stdenv.lib; SCHEDSTATS n DETECT_HUNG_TASK y + # Power management. + ${optionalString (versionOlder version "3.19") '' + PM_RUNTIME y + ''} + PM_ADVANCED_DEBUG y + ${optionalString (versionAtLeast version "3.10") '' + X86_INTEL_PSTATE y + ''} + ${optionalString (versionOlder version "3.10") '' + USB_SUSPEND y + ''} + # Support drivers that need external firmware. STANDALONE n |