Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[cascardo/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4d9ca7d..eef242e 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -193,6 +193,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        (e.g. thinkpad_acpi, sony_acpi, etc.) instead
                        of the ACPI video.ko driver.
 
+       acpi_force_32bit_fadt_addr
+                       force FADT to use 32 bit addresses rather than the
+                       64 bit X_* addresses. Some firmware have broken 64
+                       bit addresses for force ACPI ignore these and use
+                       the older legacy 32 bit addresses.
+
        acpica_no_return_repair [HW, ACPI]
                        Disable AML predefined validation mechanism
                        This mechanism can repair the evaluation result to make
@@ -608,6 +614,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        cut the overhead, others just disable the usage. So
                        only cgroup_disable=memory is actually worthy}
 
+       cgroup_no_v1=   [KNL] Disable one, multiple, all cgroup controllers in v1
+                       Format: { controller[,controller...] | "all" }
+                       Like cgroup_disable, but only applies to cgroup v1;
+                       the blacklisted controllers remain available in cgroup2.
+
        cgroup.memory=  [KNL] Pass options to the cgroup memory controller.
                        Format: <string>
                        nosocket -- Disable socket memory accounting.
@@ -1058,6 +1069,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        A valid base address must be provided, and the serial
                        port must already be setup and configured.
 
+               armada3700_uart,<addr>
+                       Start an early, polled-mode console on the
+                       Armada 3700 serial port at the specified
+                       address. The serial port must already be setup
+                       and configured. Options are not yet supported.
+
        earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
                        earlyprintk=vga
                        earlyprintk=efi
@@ -1759,7 +1776,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        keepinitrd      [HW,ARM]
 
-       kernelcore=nn[KMG]      [KNL,X86,IA-64,PPC] This parameter
+       kernelcore=     [KNL,X86,IA-64,PPC]
+                       Format: nn[KMGTPE] | "mirror"
+                       This parameter
                        specifies the amount of memory usable by the kernel
                        for non-movable allocations.  The requested amount is
                        spread evenly throughout all nodes in the system. The
@@ -1775,6 +1794,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        use the HighMem zone if it exists, and the Normal
                        zone if it does not.
 
+                       Instead of specifying the amount of memory (nn[KMGTPE]),
+                       you can specify "mirror" option. In case "mirror"
+                       option is specified, mirrored (reliable) memory is used
+                       for non-movable allocations and remaining memory is used
+                       for Movable pages. nn[KMGTPE] and "mirror" are exclusive,
+                       so you can NOT specify nn[KMGTPE] and "mirror" at the same
+                       time.
+
        kgdbdbgp=       [KGDB,HW] kgdb over EHCI usb debug port.
                        Format: <Controller#>[,poll interval]
                        The controller # is the number of the ehci usb debug
@@ -2732,6 +2759,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        we can turn it on.
                        on: enable the feature
 
+       page_poison=    [KNL] Boot-time parameter changing the state of
+                       poisoning on the buddy allocator.
+                       off: turn off poisoning
+                       on: turn on poisoning
+
        panic=          [KNL] Kernel behaviour on panic: delay <timeout>
                        timeout > 0: seconds before rebooting
                        timeout = 0: wait forever
@@ -3506,6 +3538,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                on      Mark read-only kernel memory as read-only (default).
                off     Leave read-only kernel memory writable for debugging.
 
+       rockchip.usb_uart
+                       Enable the uart passthrough on the designated usb port
+                       on Rockchip SoCs. When active, the signals of the
+                       debug-uart get routed to the D+ and D- pins of the usb
+                       port and the regular usb controller gets disabled.
+
        root=           [KNL] Root filesystem
                        See name_to_dev_t comment in init/do_mounts.c.