diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2012-02-22 12:12:00 +0000 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2012-02-22 12:12:00 +0000 |
| commit | 77a8ea6fbd474bca969371506ee663e1517a5905 (patch) | |
| tree | d99b0602343ebf99caa458563d9481fef363c3b5 /pkgs/os-specific/linux | |
| parent | e4c4ab35e5d219d2dfa6e36126db21ac99d39cad (diff) | |
| download | nixpkgs-77a8ea6fbd474bca969371506ee663e1517a5905.tar nixpkgs-77a8ea6fbd474bca969371506ee663e1517a5905.tar.gz nixpkgs-77a8ea6fbd474bca969371506ee663e1517a5905.tar.bz2 nixpkgs-77a8ea6fbd474bca969371506ee663e1517a5905.tar.lz nixpkgs-77a8ea6fbd474bca969371506ee663e1517a5905.tar.xz nixpkgs-77a8ea6fbd474bca969371506ee663e1517a5905.tar.zst nixpkgs-77a8ea6fbd474bca969371506ee663e1517a5905.zip | |
merge powertop kernel config into default kernel config
svn path=/nixpkgs/trunk/; revision=32472
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.39.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.0.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.1.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.2.nix | 16 |
4 files changed, 56 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix index 44a82e0836d..64aa288c8c8 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 557223e6260..95b3ef16699 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index f1f1aa7f8fc..2e48eb3e460 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index b77f6eb4788..458b8bbce3d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n |