Merge remote-tracking branch 'iommu/next'

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d850308752550ff32af778fbea2548ad151557b7..8cfca14cff454dd54e4dcda91ead7f9c30cd4793 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -460,6 +460,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        driver will print ACPI tables for AMD IOMMU during
                        IOMMU initialization.
 
+       amd_iommu_intr= [HW,X86-64]
+                       Specifies one of the following AMD IOMMU interrupt
+                       remapping modes:
+                       legacy     - Use legacy interrupt remapping mode.
+                       vapic      - Use virtual APIC mode, which allows IOMMU
+                                    to inject interrupts directly into guest.
+                                    This mode requires kvm-amd.avic=1.
+                                    (Default when IOMMU HW support is present.)
+
        amijoy.map=     [HW,JOY] Amiga joystick support
                        Map of devices attached to JOY0DAT and JOY1DAT
                        Format: <a>,<b>
@@ -3255,6 +3264,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        raid=           [HW,RAID]
                        See Documentation/md.txt.
 
+       ram_latent_entropy
+                       Enable a very simple form of latent entropy extraction
+                       from the first 4GB of memory as the bootmem allocator
+                       passes the memory pages to the buddy allocator.
+
        ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
                        See Documentation/blockdev/ramdisk.txt.