diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /Documentation/x86_64/boot-options.txt | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'Documentation/x86_64/boot-options.txt')
| -rw-r--r-- | Documentation/x86_64/boot-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index 4303e0c12476..74b77f9e91bc 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
| @@ -199,6 +199,11 @@ IOMMU | |||
| 199 | allowed overwrite iommu off workarounds for specific chipsets. | 199 | allowed overwrite iommu off workarounds for specific chipsets. |
| 200 | soft Use software bounce buffering (default for Intel machines) | 200 | soft Use software bounce buffering (default for Intel machines) |
| 201 | noaperture Don't touch the aperture for AGP. | 201 | noaperture Don't touch the aperture for AGP. |
| 202 | allowdac Allow DMA >4GB | ||
| 203 | When off all DMA over >4GB is forced through an IOMMU or bounce | ||
| 204 | buffering. | ||
| 205 | nodac Forbid DMA >4GB | ||
| 206 | panic Always panic when IOMMU overflows | ||
| 202 | 207 | ||
| 203 | swiotlb=pages[,force] | 208 | swiotlb=pages[,force] |
| 204 | 209 | ||