1 files changed, 47 insertions, 12 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f4a04c0c7ed..5438a2d7907 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -245,7 +245,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         acpi_sleep=     [HW,ACPI] Sleep options
                         Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
-                                  old_ordering, s4_nonvs, sci_force_enable }
+                                  old_ordering, nonvs, sci_force_enable }
                         See Documentation/power/video.txt for information on
                         s3_bios and s3_mode.
                         s3_beep is for debugging; it makes the PC's speaker beep
@@ -626,6 +626,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         disable=        [IPV6]
                         See Documentation/networking/ipv6.txt.
 
+        disable_ddw     [PPC/PSERIES]
+                        Disable Dynamic DMA Window support. Use this if
+                        to workaround buggy firmware.
+
         disable_ipv6=   [IPV6]
                         See Documentation/networking/ipv6.txt.
 
@@ -695,7 +699,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         ekgdboc=        [X86,KGDB] Allow early kernel console debugging
                         ekgdboc=kbd
 
-                        This is desgined to be used in conjunction with
+                        This is designed to be used in conjunction with
                         the boot argument: earlyprintk=vga
 
         edd=            [EDD]
@@ -868,6 +872,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                If specified, z/VM IUCV HVC accepts connections
                                from listed z/VM user IDs only.
 
+        keep_bootcon    [KNL]
+                        Do not unregister boot console at start. This is only
+                        useful for debugging when something happens in the window
+                        between unregistering the boot console and initializing
+                        the real console.
+
         i2c_bus=        [HW] Override the default board specific I2C bus speed
                              or register an additional I2C bus that is not
                              registered from board initialization code.
@@ -1580,16 +1590,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         of returning the full 64-bit number.
                         The default is to return 64-bit inode numbers.
 
+        nfs.nfs4_disable_idmapping=
+                        [NFSv4] When set, this option disables the NFSv4
+                        idmapper on the client, but only if the mount
+                        is using the 'sec=sys' security flavour. This may
+                        make migration from legacy NFSv2/v3 systems easier
+                        provided that the server has the appropriate support.
+                        The default is to always enable NFSv4 idmapping.
+
         nmi_debug=      [KNL,AVR32,SH] Specify one or more actions to take
                         when a NMI is triggered.
                         Format: [state][,regs][,debounce][,die]
 
         nmi_watchdog=   [KNL,BUGS=X86] Debugging features for SMP kernels
-                        Format: [panic,][num]
+                        Format: [panic,][nopanic,][num]
                         Valid num: 0
                         0 - turn nmi_watchdog off
                         When panic is specified, panic when an NMI watchdog
-                        timeout occurs.
+                        timeout occurs (or 'nopanic' to override the opposite
+                        default).
                         This is useful when you use a panic=... timeout and
                         need the box quickly up again.
 
@@ -1645,6 +1664,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         noexec=on: enable non-executable mappings (default)
                         noexec=off: disable non-executable mappings
 
+        nosmep          [X86]
+                        Disable SMEP (Supervisor Mode Execution Protection)
+                        even if it is supported by processor.
+
         noexec32        [X86-64]
                         This affects only 32-bit executables.
                         noexec32=on: enable non-executable mappings (default)
@@ -1754,9 +1777,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         nosoftlockup    [KNL] Disable the soft-lockup detector.
 
-        noswapaccount   [KNL] Disable accounting of swap in memory resource
-                        controller. (See Documentation/cgroups/memory.txt)
-
         nosync          [HW,M68K] Disables sync negotiation for all devices.
 
         notsc           [BUGS=X86-32] Disable Time Stamp Counter
@@ -1813,10 +1833,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                 perfmon on Intel CPUs instead of the
                                 CPU specific event set.
 
+        oops=panic      Always panic on oopses. Default is to just kill the
+                        process, but there is a small probability of
+                        deadlocking the machine.
+                        This will also cause panics on machine check exceptions.
+                        Useful together with panic=30 to trigger a reboot.
+
         OSS             [HW,OSS]
                         See Documentation/sound/oss/oss-parameters.txt
 
-        panic=          [KNL] Kernel behaviour on panic
+        panic=          [KNL] Kernel behaviour on panic: delay <timeout>
+                        seconds before rebooting
                         Format: <timeout>
 
         parkbd.port=    [HW] Parallel port number the keyboard adapter is
@@ -2319,6 +2346,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         softlockup_panic=
                         [KNL] Should the soft-lockup detector generate panics.
+                        Format: <integer>
 
         sonypi.*=       [HW] Sony Programmable I/O Control Device driver
                         See Documentation/sonypi.txt
@@ -2444,11 +2472,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         <deci-seconds>: poll all this frequency
                         0: no polling (default)
 
+        threadirqs      [KNL]
+                        Force threading of all interrupt handlers except those
+                        marked explicitely IRQF_NO_THREAD.
+
         topology=       [S390]
                         Format: {off | on}
                         Specify if the kernel should make use of the cpu
-                        topology informations if the hardware supports these.
-                        The scheduler will make use of these informations and
+                        topology information if the hardware supports this.
+                        The scheduler will make use of this information and
                         e.g. base its process migration decisions on it.
                         Default is on.
 
@@ -2501,8 +2533,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         reported either.
 
         unknown_nmi_panic
-                        [X86]
-                        Set unknown_nmi_panic=1 early on boot.
+                        [X86] Cause panic on unknown NMI.
 
         usbcore.autosuspend=
                         [USB] The autosuspend time delay (in seconds) used
@@ -2551,6 +2582,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                         bytes of sense data);
                                 c = FIX_CAPACITY (decrease the reported
                                         device capacity by one sector);
+                                d = NO_READ_DISC_INFO (don't use
+                                        READ_DISC_INFO command);
+                                e = NO_READ_CAPACITY_16 (don't use
+                                        READ_CAPACITY_16 command);
                                 h = CAPACITY_HEURISTICS (decrease the
                                         reported device capacity by one
                                         sector if the number is odd);