1 files changed, 45 insertions, 5 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 839b21b0699a..f5fce483930c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -58,6 +58,7 @@ parameter is applicable:
         ISAPNP  ISA PnP code is enabled.
         ISDN    Appropriate ISDN support is enabled.
         JOY     Appropriate joystick support is enabled.
+        KGDB    Kernel debugger support is enabled.
         KVM     Kernel Virtual Machine support is enabled.
         LIBATA  Libata driver is enabled
         LP      Printer support is enabled.
@@ -99,6 +100,7 @@ parameter is applicable:
         SWSUSP  Software suspend (hibernation) is enabled.
         SUSPEND System suspend states are enabled.
         FTRACE  Function tracing enabled.
+        TPM     TPM drivers are enabled.
         TS      Appropriate touchscreen support is enabled.
         UMS     USB Mass Storage support is enabled.
         USB     USB support is enabled.
@@ -151,6 +153,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         strict -- Be less tolerant of platforms that are not
                                 strictly ACPI specification compliant.
                         rsdt -- prefer RSDT over (default) XSDT
+                        copy_dsdt -- copy DSDT to memory
 
                         See also Documentation/power/pm.txt, pci=noacpi
 
@@ -324,6 +327,8 @@ and is between 256 and 4096 characters. It is defined in the file
                                     they are unmapped. Otherwise they are
                                     flushed before they will be reused, which
                                     is a lot of faster
+                        off       - do not initialize any AMD IOMMU found in
+                                    the system
 
         amijoy.map=     [HW,JOY] Amiga joystick support
                         Map of devices attached to JOY0DAT and JOY1DAT
@@ -708,6 +713,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         The VGA output is eventually overwritten by the real
                         console.
 
+        ekgdboc=        [X86,KGDB] Allow early kernel console debugging
+                        ekgdboc=kbd
+
+                        This is desgined to be used in conjunction with
+                        the boot argument: earlyprintk=vga
+
         eata=           [HW,SCSI]
 
         edd=            [EDD]
@@ -784,8 +795,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         as early as possible in order to facilitate early
                         boot debugging.
 
-        ftrace_dump_on_oops
+        ftrace_dump_on_oops[=orig_cpu]
                         [FTRACE] will dump the trace buffers on oops.
+                        If no parameter is passed, ftrace will dump
+                        buffers of all CPUs, but if you pass orig_cpu, it will
+                        dump only the buffer of the CPU that triggered the
+                        oops.
 
         ftrace_filter=[function-list]
                         [FTRACE] Limit the functions traced by the function
@@ -1112,10 +1127,26 @@ and is between 256 and 4096 characters. It is defined in the file
                         use the HighMem zone if it exists, and the Normal
                         zone if it does not.
 
-        kgdboc=         [HW] kgdb over consoles.
-                        Requires a tty driver that supports console polling.
-                        (only serial supported for now)
-                        Format: <serial_device>[,baud]
+        kgdbdbgp=       [KGDB,HW] kgdb over EHCI usb debug port.
+                        Format: <Controller#>[,poll interval]
+                        The controller # is the number of the ehci usb debug
+                        port as it is probed via PCI.  The poll interval is
+                        optional and is the number seconds in between
+                        each poll cycle to the debug port in case you need
+                        the functionality for interrupting the kernel with
+                        gdb or control-c on the dbgp connection.  When
+                        not using this parameter you use sysrq-g to break into
+                        the kernel debugger.
+
+        kgdboc=         [KGDB,HW] kgdb over consoles.
+                        Requires a tty driver that supports console polling,
+                        or a supported polling keyboard driver (non-usb).
+                        Serial only format: <serial_device>[,baud]
+                        keyboard only format: kbd
+                        keyboard and serial format: kbd,<serial_device>[,baud]
+
+        kgdbwait        [KGDB] Stop kernel execution and enter the
+                        kernel debugger at the earliest opportunity.
 
         kmac=           [MIPS] korina ethernet MAC address.
                         Configure the RouterBoard 532 series on-chip
@@ -2610,6 +2641,15 @@ and is between 256 and 4096 characters. It is defined in the file
 
         tp720=          [HW,PS2]
 
+        tpm_suspend_pcr=[HW,TPM]
+                        Format: integer pcr id
+                        Specify that at suspend time, the tpm driver
+                        should extend the specified pcr with zeros,
+                        as a workaround for some chips which fail to
+                        flush the last written pcr on TPM_SaveState.
+                        This will guarantee that all the other pcrs
+                        are saved.
+
         trace_buf_size=nn[KMG]
                         [FTRACE] will set tracing buffer size.