1 files changed, 23 insertions, 5 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fc99075e0af4..f8cb55c30b0f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -49,6 +49,7 @@ restrictions referred to are that the relevant option is valid if:
         MCA     MCA bus support is enabled.
         MDA     MDA console support is enabled.
         MOUSE   Appropriate mouse support is enabled.
+        MSI     Message Signaled Interrupts (PCI).
         MTD     MTD support is enabled.
         NET     Appropriate network support is enabled.
         NUMA    NUMA support is enabled.
@@ -366,12 +367,17 @@ running once the system is up.
                 tty<n>  Use the virtual console device <n>.
 
                 ttyS<n>[,options]
+                ttyUSB0[,options]
                         Use the specified serial port.  The options are of
-                        the form "bbbbpn", where "bbbb" is the baud rate,
-                        "p" is parity ("n", "o", or "e"), and "n" is bits.
-                        Default is "9600n8".
+                        the form "bbbbpnf", where "bbbb" is the baud rate,
+                        "p" is parity ("n", "o", or "e"), "n" is number of
+                        bits, and "f" is flow control ("r" for RTS or
+                        omit it).  Default is "9600n8".
 
-                        See also Documentation/serial-console.txt.
+                        See Documentation/serial-console.txt for more
+                        information.  See
+                        Documentation/networking/netconsole.txt for an
+                        alternative.
 
                 uart,io,<addr>[,options]
                 uart,mmio,<addr>[,options]
@@ -1008,7 +1014,9 @@ running once the system is up.
                         noexec=on: enable non-executable mappings (default)
                         noexec=off: disable nn-executable mappings
 
-        nofxsr          [BUGS=IA-32]
+        nofxsr          [BUGS=IA-32] Disables x86 floating point extended
+                        register save and restore. The kernel will only save
+                        legacy floating-point registers on task switch.
 
         nohlt           [BUGS=ARM]
 
@@ -1053,6 +1061,8 @@ running once the system is up.
 
         nosbagart       [IA-64]
 
+        nosep           [BUGS=IA-32] Disables x86 SYSENTER/SYSEXIT support.
+
         nosmp           [SMP] Tells an SMP kernel to act as a UP kernel.
 
         nosync          [HW,M68K] Disables sync negotiation for all devices.
@@ -1122,6 +1132,11 @@ running once the system is up.
         pas16=          [HW,SCSI]
                         See header of drivers/scsi/pas16.c.
 
+        pause_on_oops=
+                        Halt all CPUs after the first oops has been printed for
+                        the specified number of seconds.  This is to be used if
+                        your oopses keep scrolling off the screen.
+
         pcbit=          [HW,ISDN]
 
         pcd.            [PARIDE]
@@ -1143,6 +1158,9 @@ running once the system is up.
                                 Mechanism 2.
                 nommconf        [IA-32,X86_64] Disable use of MMCONFIG for PCI
                                 Configuration
+                nomsi           [MSI] If the PCI_MSI kernel config parameter is
+                                enabled, this kernel boot option can be used to
+                                disable the use of MSI interrupts system-wide.
                 nosort          [IA-32] Don't sort PCI devices according to
                                 order given by the PCI BIOS. This sorting is
                                 done to get a device order compatible with