Merge tag 'sound-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8e5abd640b0bc0ab6bfbb21ef7ff14d923a8e691..0ee46a8f64010f7881b3ecaaa8fe5252cb07186b 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
@@ -666,7 +672,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        clearcpuid=BITNUM [X86]
                        Disable CPUID feature X for the kernel. See
-                       arch/x86/include/asm/cpufeature.h for the valid bit
+                       arch/x86/include/asm/cpufeatures.h for the valid bit
                        numbers. Note the Linux specific bits are not necessarily
                        stable over kernel options, but the vendor specific
                        ones should be.
@@ -1058,6 +1064,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
@@ -1687,6 +1699,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        ip=             [IP_PNP]
                        See Documentation/filesystems/nfs/nfsroot.txt.
 
+       irqaffinity=    [SMP] Set the default irq affinity mask
+                       Format:
+                       <cpu number>,...,<cpu number>
+                       or
+                       <cpu number>-<cpu number>
+                       (must be a positive range in ascending order)
+                       or a mixture
+                       <cpu number>,...,<cpu number>-<cpu number>
+
        irqfixup        [HW]
                        When an interrupt is not handled search all handlers
                        for it. Intended to get systems with badly broken
@@ -2576,6 +2597,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        nointroute      [IA-64]
 
+       noinvpcid       [X86] Disable the INVPCID cpu feature.
+
        nojitter        [IA-64] Disables jitter checking for ITC timers.
 
        no-kvmclock     [X86,KVM] Disable paravirtualized KVM clock driver
@@ -3510,6 +3533,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.