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

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix 32-bit build warning with __cmpxchg()
  intr-remap: allow disabling source id checking

1 files changed, 7 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4956686f99bf..2c85c0692b01 100644
--- 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.
 
+        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
@@ -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.
+                        [Deprecated - use intremap=off]
 
         nointroute      [IA-64]