aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2004-12-01 08:28:14 -0500
committerLen Brown <len.brown@intel.com>2004-12-01 08:28:14 -0500
commit49f6e706ff7c2bc848313929401a6ccfedda3b09 (patch)
treeb5b1314ea866fdd4bea5d53d20b0530ecf3e103e /Documentation
parent591e47a6006887b957d852889f9d4332f98e4335 (diff)
parent211001b963eba0d1e79826b00fc51316220653e6 (diff)
downloadhistory-49f6e706ff7c2bc848313929401a6ccfedda3b09.tar.gz
Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2e34b1c6a7da7a..e2fe7503af1702 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1006,10 +1006,9 @@ running once the system is up.
(param: profile step/bucket size as a power of 2 for
statistical time based profiling)
- processor.c2= [HW, ACPI]
- processor.c3= [HW, ACPI]
- 0 - disable C2 or C3 idle power saving state.
- 1 - enable C2 or C3 (default unless DMI blacklist entry)
+ processor.max_cstate= [HW, ACPI]
+ Limit processor to maximum C-state
+ max_cstate=9 overrides any DMI blacklist limit.
prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
before loading.