1 files changed, 16 insertions, 9 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6ca1f5cb71e0..d6e6724446c8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1350,9 +1350,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         it is equivalent to "nosmp", which also disables
                         the IO APIC.
 
-        max_loop=       [LOOP] Maximum number of loopback devices that can
-                        be mounted
-                        Format: <1-256>
+        max_loop=       [LOOP] The number of loop block devices that get
+        (loop.max_loop) unconditionally pre-created at init time. The default
+                        number is configured by BLK_DEV_LOOP_MIN_COUNT. Instead
+                        of statically allocating a predefined number, loop
+                        devices can be requested on-demand with the
+                        /dev/loop-control interface.
 
         mcatest=        [IA-64]
 
@@ -2083,9 +2086,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         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.
+        pnp.debug=1     [PNP]
+                        Enable PNP debug messages (depends on the
+                        CONFIG_PNP_DEBUG_MESSAGES option).  Change at run-time
+                        via /sys/module/pnp/parameters/debug.  We always show
+                        current resource usage; turning this on also shows
+                        possible settings and some assignment information.
 
         pnpacpi=        [ACPI]
                         { off }
@@ -2700,10 +2706,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         functions are at fixed addresses, they make nice
                         targets for exploits that can control RIP.
 
-                        emulate     [default] Vsyscalls turn into traps and are
-                                    emulated reasonably safely.
+                        emulate     Vsyscalls turn into traps and are emulated
+                                    reasonably safely.
 
-                        native      Vsyscalls are native syscall instructions.
+                        native      [default] Vsyscalls are native syscall
+                                    instructions.
                                     This is a little bit faster than trapping
                                     and makes a few dynamic recompilers work
                                     better than they would in emulation mode.