Merge git://git.infradead.org/iommu-2.6

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4956686f99bfde517236dca2bc09cfd84ff51c2f..2c85c0692b015cc099710b0ba4b9a4f0c30a745d 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -981,6 +981,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        result in a hardware IOTLB flush operation as opposed
                        to batching them for performance.
 
                        result in a hardware IOTLB flush operation as opposed
                        to batching them for performance.
 

+       intremap=       [X86-64, Intel-IOMMU]
+                       Format: { on (default) | off | nosid }
+                       on      enable Interrupt Remapping (default)
+                       off     disable Interrupt Remapping
+                       nosid   disable Source ID checking
+

        inttest=        [IA64]
 
        iomem=          Disable strict checking of access to MMIO memory
        inttest=        [IA64]
 
        iomem=          Disable strict checking of access to MMIO memory


@@ -1681,6 +1687,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nointremap      [X86-64, Intel-IOMMU] Do not enable interrupt
                        remapping.
 
        nointremap      [X86-64, Intel-IOMMU] Do not enable interrupt
                        remapping.

+                       [Deprecated - use intremap=off]

 
        nointroute      [IA-64]
 
 
        nointroute      [IA-64]