diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-15 17:34:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-15 17:34:20 -0700 |
| commit | e2e96c663639a3361bb1a84e666887d308c6c87e (patch) | |
| tree | 7c28b1e5baaff4741d974193ba30f1c53992596f /Documentation | |
| parent | 7355a5a654ccbbfd2fd11bb1e2389910f786ea92 (diff) | |
| parent | 1a8bd481bfba30515b54368d90a915db3faf302f (diff) | |
| download | linux-e2e96c663639a3361bb1a84e666887d308c6c87e.tar.gz linux-e2e96c663639a3361bb1a84e666887d308c6c87e.tar.bz2 linux-e2e96c663639a3361bb1a84e666887d308c6c87e.zip | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 7 |
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] |