1 files changed, 46 insertions, 15 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 53ba7c7d82b3..343e0f0f84b6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -218,20 +218,47 @@ and is between 256 and 4096 characters. It is defined in the file
         acpi.debug_level=       [HW,ACPI]
                         Format: <int>
                         Each bit of the <int> indicates an ACPI debug level,
-                        1: enable, 0: disable. It is useful for boot time
-                        debugging. After system has booted up, it can be set
-                        via /sys/module/acpi/parameters/debug_level.
-                        CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
-                        Available bits (add the numbers together) to enable different
-                        debug output levels of the ACPI subsystem:
-                        0x01 error 0x02 warn 0x04 init 0x08 debug object
-                        0x10 info 0x20 init names 0x40 parse 0x80 load
-                        0x100 dispatch 0x200 execute 0x400 names 0x800 operation region
-                        0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects
-                        0x10000 resources 0x20000 user requests 0x40000 package.
-                        The number can be in decimal or prefixed with 0x in hex.
-                        Warning: Many of these options can produce a lot of
-                        output and make your system unusable. Be very careful.
+                        which corresponds to the level in an ACPI_DEBUG_PRINT
+                        statement.  After system has booted up, this mask
+                        can be set via /sys/module/acpi/parameters/debug_level.
+
+                        CONFIG_ACPI_DEBUG must be enabled for this to produce
+                        any output.  The number can be in decimal or prefixed
+                        with 0x in hex.  Some of these options produce so much
+                        output that the system is unusable.
+
+                        The following global components are defined by the
+                        ACPI CA:
+                               0x01 error
+                               0x02 warn
+                               0x04 init
+                               0x08 debug object
+                               0x10 info
+                               0x20 init names
+                               0x40 parse
+                               0x80 load
+                              0x100 dispatch
+                              0x200 execute
+                              0x400 names
+                              0x800 operation region
+                             0x1000 bfield
+                             0x2000 tables
+                             0x4000 values
+                             0x8000 objects
+                            0x10000 resources
+                            0x20000 user requests
+                            0x40000 package
+                        The number can be in decimal or prefixed with 0x in hex.
+                        Warning: Many of these options can produce a lot of
+                        output and make your system unusable. Be very careful.
+
+        acpi.power_nocheck=     [HW,ACPI]
+                        Format: 1/0 enable/disable the check of power state.
+                        On some bogus BIOS the _PSC object/_STA object of
+                        power resource can't return the correct device power
+                        state. In such case it is unneccessary to check its
+                        power state again in power transition.
+                        1 : disable the power state check
 
         acpi_pm_good    [X86-32,X86-64]
                         Override the pmtimer bug detection: force the kernel
@@ -1711,6 +1738,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         Override pmtimer IOPort with a hex value.
                         e.g. pmtmr=0x508
 
+        pnp.debug       [PNP]
+                        Enable PNP debug messages.  This depends on the
+                        CONFIG_PNP_DEBUG_MESSAGES option.
+
         pnpacpi=        [ACPI]
                         { off }
 
@@ -2208,7 +2239,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         thermal.crt=    [HW,ACPI]
                         -1: disable all critical trip points in all thermal zones
-                        <degrees C>: lower all critical trip points
+                        <degrees C>: override all critical trip points
 
         thermal.nocrt=  [HW,ACPI]
                         Set to disable actions on ACPI thermal zone