Merge tag 'rtc-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni...

[firefly-linux-kernel-4.4.55.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ae4474940fe22129492ad62afad870702e6884fc..c84d078a6376159f4d28ea71b2550a20abdb8c63 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1019,6 +1019,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        earlyprintk=serial[,0x...[,baudrate]]
                        earlyprintk=ttySn[,baudrate]
                        earlyprintk=dbgp[debugController#]
+                       earlyprintk=pciserial,bus:device.function[,baudrate]
 
                        earlyprintk is useful when the kernel crashes before
                        the normal console is initialized. It is not enabled by
@@ -1790,6 +1791,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
                        * [no]ncq: Turn on or off NCQ.
 
+                       * [no]ncqtrim: Turn off queued DSM TRIM.
+
                        * nohrst, nosrst, norst: suppress hard, soft
                           and both resets.
 
@@ -2453,7 +2456,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        nomca           [IA-64] Disable machine check abort handling
 
-       nomce           [X86-32] Machine Check Exception
+       nomce           [X86-32] Disable Machine Check Exception
 
        nomfgpt         [X86-32] Disable Multi-Function General Purpose
                        Timer usage (for AMD Geode machines).