summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-12 00:19:23 -0400
committerLen Brown <len.brown@intel.com>2007-08-12 00:19:23 -0400
commitd8dd3cbcf1b30c315a28f65cb719bb2d7105a317 (patch)
tree193677fd111ace3e46d310294c04c038a8fa3202 /Documentation
parentfc0dc4d3aa9c73e275accf2966e0bdf16bff45f1 (diff)
parent0b5bfa1cbefdc6e4c60f30ed545389b5ffe0f75f (diff)
downloadlinux-3.10-d8dd3cbcf1b30c315a28f65cb719bb2d7105a317.tar.gz
linux-3.10-d8dd3cbcf1b30c315a28f65cb719bb2d7105a317.tar.bz2
linux-3.10-d8dd3cbcf1b30c315a28f65cb719bb2d7105a317.zip
Pull bugzilla-8842 into release branch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt20
1 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 09c0ec100f6..975f029be25 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1822,6 +1822,26 @@ and is between 256 and 4096 characters. It is defined in the file
thash_entries= [KNL,NET]
Set number of hash buckets for TCP connection
+ thermal.act= [HW,ACPI]
+ -1: disable all active trip points in all thermal zones
+ <degrees C>: override all lowest active trip points
+
+ thermal.nocrt= [HW,ACPI]
+ Set to disable actions on ACPI thermal zone
+ critical and hot trip points.
+
+ thermal.off= [HW,ACPI]
+ 1: disable ACPI thermal control
+
+ thermal.psv= [HW,ACPI]
+ -1: disable all passive trip points
+ <degrees C>: override all passive trip points to this value
+
+ thermal.tzp= [HW,ACPI]
+ Specify global default ACPI thermal zone polling rate
+ <deci-seconds>: poll all this frequency
+ 0: no polling (default)
+
time Show timing data prefixed to each printk message line
[deprecated, see 'printk.time']