Pull bugzilla-8842 into release branch

1 files changed, 20 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 09c0ec100f61..975f029be25c 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']