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

[linux-2.6-block.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9653cf2f97279e5fda2257ed3221ce50fb6129c2..c3bfacb92910dc8d044bec88122c4a85328ed8d5 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1277,6 +1277,20 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        iucv=           [HW,NET]
 
+       ivrs_ioapic     [HW,X86_64]
+                       Provide an override to the IOAPIC-ID<->DEVICE-ID
+                       mapping provided in the IVRS ACPI table. For
+                       example, to map IOAPIC-ID decimal 10 to
+                       PCI device 00:14.0 write the parameter as:
+                               ivrs_ioapic[10]=00:14.0
+
+       ivrs_hpet       [HW,X86_64]
+                       Provide an override to the HPET-ID<->DEVICE-ID
+                       mapping provided in the IVRS ACPI table. For
+                       example, to map HPET-ID decimal 0 to
+                       PCI device 00:14.0 write the parameter as:
+                               ivrs_hpet[0]=00:14.0
+
        js=             [HW,JOY] Analog joystick
                        See Documentation/input/joystick.txt.
 
@@ -1964,6 +1978,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Valid arguments: on, off
                        Default: on
 
+       nohz_full=      [KNL,BOOT]
+                       In kernels built with CONFIG_NO_HZ_FULL=y, set
+                       the specified list of CPUs whose tick will be stopped
+                       whenever possible. The boot CPU will be forced outside
+                       the range to maintain the timekeeping.
+                       The CPUs in this range must also be included in the
+                       rcu_nocbs= set.
+
        noiotrap        [SH] Disables trapped I/O port accesses.
 
        noirqdebug      [X86-32] Disables the code which attempts to detect and