Merge branch 'akpm-current/current'

[karo-tx-linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c76200afb7bb6575402427786decd10ce072dc7d..f8aae632f02f678000f9de7a8d507a5ea0bb9404 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -790,8 +790,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        is passed, kernel could allocate physical memory region
                        above 4G, that cause second kernel crash on system
                        that require some amount of low memory, e.g. swiotlb
-                       requires at least 64M+32K low memory.  Kernel would
-                       try to allocate 72M below 4G automatically.
+                       requires at least 64M+32K low memory, also enough extra
+                       low memory is needed to make sure DMA buffers for 32-bit
+                       devices won't run out. Kernel would try to allocate at
+                       at least 256M below 4G automatically.
                        This one let user to specify own low range under 4G
                        for second kernel instead.
                        0: to disable low allocation.
@@ -930,11 +932,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        The filter can be disabled or changed to another
                        driver later using sysfs.
 
-       drm_kms_helper.edid_firmware=[<connector>:]<file>
-                       Broken monitors, graphic adapters and KVMs may
-                       send no or incorrect EDID data sets. This parameter
-                       allows to specify an EDID data set in the
-                       /lib/firmware directory that is used instead.
+       drm_kms_helper.edid_firmware=[<connector>:]<file>[,[<connector>:]<file>]
+                       Broken monitors, graphic adapters, KVMs and EDIDless
+                       panels may send no or incorrect EDID data sets.
+                       This parameter allows to specify an EDID data sets
+                       in the /lib/firmware directory that are used instead.
                        Generic built-in EDID data sets are used, if one of
                        edid/1024x768.bin, edid/1280x1024.bin,
                        edid/1680x1050.bin, or edid/1920x1080.bin is given
@@ -943,7 +945,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        available in Documentation/EDID/HOWTO.txt. An EDID
                        data set will only be used for a particular connector,
                        if its name and a colon are prepended to the EDID
-                       name.
+                       name. Each connector may use a unique EDID data
+                       set by separating the files with a comma.  An EDID
+                       data set with no connector name will be used for
+                       any connectors not explicitly specified.
 
        dscc4.setup=    [NET]
 
@@ -972,6 +977,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        earlycon=       [KNL] Output early console device and options.
 
+                       When used with no options, the early console is
+                       determined by the stdout-path property in device
+                       tree's chosen node.
+
                cdns,<addr>
                        Start an early, polled-mode console on a cadence serial
                        port at the specified address. The cadence serial port
@@ -1024,6 +1033,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        serial port must already be setup and configured.
                        Options are not yet supported.
 
+               lpuart,<addr>
+               lpuart32,<addr>
+                       Use early console provided by Freescale LP UART driver
+                       found on Freescale Vybrid and QorIQ LS1021A processors.
+                       A valid base address must be provided, and the serial
+                       port must already be setup and configured.
+
        earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
                        earlyprintk=vga
                        earlyprintk=efi
@@ -1262,6 +1278,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
                        Default: 1024
 
+       hardlockup_all_cpu_backtrace=
+                       [KNL] Should the hard-lockup detector generate
+                       backtraces on all cpus.
+                       Format: <integer>
+
        hashdist=       [KNL,NUMA] Large hashes allocated during boot
                        are distributed across NUMA nodes.  Defaults on
                        for 64-bit NUMA, off otherwise.
@@ -1572,6 +1593,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        nosid   disable Source ID checking
                        no_x2apic_optout
                                BIOS x2APIC opt-out request will be ignored
+                       nopost  disable Interrupt Posting
 
        iomem=          Disable strict checking of access to MMIO memory
                strict  regions from userspace.
@@ -2333,11 +2355,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        nmi_watchdog=   [KNL,BUGS=X86] Debugging features for SMP kernels
                        Format: [panic,][nopanic,][num]
                        Valid num: 0 or 1
-                       0 - turn nmi_watchdog off
-                       1 - turn nmi_watchdog on
+                       0 - turn hardlockup detector in nmi_watchdog off
+                       1 - turn hardlockup detector in nmi_watchdog on
                        When panic is specified, panic when an NMI watchdog
                        timeout occurs (or 'nopanic' to override the opposite
-                       default).
+                       default). To disable both hard and soft lockup detectors,
+                       please see 'nowatchdog'.
                        This is useful when you use a panic=... timeout and
                        need the box quickly up again.