diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-02 05:48:50 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-02 05:48:50 +0900 |
| commit | f0f52a9463839c52a63c05d6e7d4a330d94a9794 (patch) | |
| tree | d964f65aa37dd46b457bc615f2f37e75390c6df8 /Documentation | |
| parent | 0f48f2600911d5de6393829e4a9986d4075558b3 (diff) | |
| parent | 70e535d1e5d1e4317e894d6228b762cf9c3fbc6a (diff) | |
| download | linux-rpi-f0f52a9463839c52a63c05d6e7d4a330d94a9794.tar.gz linux-rpi-f0f52a9463839c52a63c05d6e7d4a330d94a9794.tar.bz2 linux-rpi-f0f52a9463839c52a63c05d6e7d4a330d94a9794.zip | |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: Fix off-by-one in RMRR setup
intel-iommu: Add domain check in domain_remove_one_dev_info
intel-iommu: Remove Host Bridge devices from identity mapping
intel-iommu: Use coherent DMA mask when requested
intel-iommu: Dont cache iova above 32bit
intel-iommu: Speed up processing of the identity_mapping function
intel-iommu: Check for identity mapping candidate using system dma mask
intel-iommu: Only unlink device domains from iommu
intel-iommu: Enable super page (2MiB, 1GiB, etc.) support
intel-iommu: Flush unmaps at domain_exit
intel-iommu: Remove obsolete comment from detect_intel_iommu
intel-iommu: fix VT-d PMR disable for TXT on S3 resume
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 5438a2d7907f..d9a203b058f1 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -999,7 +999,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. With this option on every unmap_single operation will result in a hardware IOTLB flush operation as opposed to batching them for performance. - + sp_off [Default Off] + By default, super page will be supported if Intel IOMMU + has the capability. With this option, super page will + not be supported. intremap= [X86-64, Intel-IOMMU] Format: { on (default) | off | nosid } on enable Interrupt Remapping (default) |