diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /Documentation/x86_64 | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'Documentation/x86_64')
| -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 | ||