Merge branches 'x86/early-printk', 'x86/microcode' and 'core/objtool' into x86/urgent...

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 5b5f1ba76bba1ff9fc92d19c46c3e3a75f7c9d57..81d1d5a7472804e50a663480ef92dc67abc71ab5 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1068,7 +1068,7 @@
                        earlyprintk=serial[,0x...[,baudrate]]
                        earlyprintk=ttySn[,baudrate]
                        earlyprintk=dbgp[debugController#]
-                       earlyprintk=pciserial,bus:device.function[,baudrate]
+                       earlyprintk=pciserial[,force],bus:device.function[,baudrate]
                        earlyprintk=xdbc[xhciController#]
 
                        earlyprintk is useful when the kernel crashes before
@@ -1100,6 +1100,10 @@
 
                        The sclp output can only be used on s390.
 
+                       The optional "force" to "pciserial" enables use of a
+                       PCI device even when its classcode is not of the
+                       UART class.
+
        edac_report=    [HW,EDAC] Control how to report EDAC event
                        Format: {"on" | "off" | "force"}
                        on: enable EDAC to report H/W event. May be overridden
@@ -2428,7 +2432,7 @@
                        seconds.  Use this parameter to check at some
                        other rate.  0 disables periodic checking.
 
-       memtest=        [KNL,X86,ARM] Enable memtest
+       memtest=        [KNL,X86,ARM,PPC] Enable memtest
                        Format: <integer>
                        default : 0 <disable>
                        Specifies the number of memtest passes to be
@@ -4851,6 +4855,18 @@
                        This is actually a boot loader parameter; the value is
                        passed to the kernel using a special protocol.
 
+       vm_debug[=options]      [KNL] Available with CONFIG_DEBUG_VM=y.
+                       May slow down system boot speed, especially when
+                       enabled on systems with a large amount of memory.
+                       All options are enabled by default, and this
+                       interface is meant to allow for selectively
+                       enabling or disabling specific virtual memory
+                       debugging features.
+
+                       Available options are:
+                         P     Enable page structure init time poisoning
+                         -     Disable all of the above options
+
        vmalloc=nn[KMG] [KNL,BOOT] Forces the vmalloc area to have an exact
                        size of <nn>. This can be used to increase the
                        minimum size (128MB on x86). It can also be used to