diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 15:37:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 15:37:55 (GMT) |
| commit | 369aa8395a5dcc89230f1de5459124c4b0db9fca (patch) | |
| tree | d95edf4c52e343e2080427ad153da051ea52eee6 /Documentation | |
| parent | bf603625660b1742004bf86432ce3c210d14d4fd (diff) | |
| parent | c84ef5305930d19bdd6cd576b3a3a73786a82e57 (diff) | |
| download | linux-fsl-qoriq-369aa8395a5dcc89230f1de5459124c4b0db9fca.tar.xz | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] Use early clobber in semaphores
[PATCH] Define vsyscall cache as blob to make clearer that user space shouldn't use it
[PATCH] Re-positioning the bss segment
[PATCH] Use ARRAY_SIZE in setup.c
[PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE()
[PATCH] x86: Clean up x86 NMI sysctls
[PATCH] Refactor some duplicated code in mpparse.c
[PATCH] Document iommu=panic
[PATCH] Fix broken indentation in iommu_setup
[PATCH] Allow disabling DAC using command line options
[PATCH] Add proper sparse __user casts to __copy_to_user_inatomic
[PATCH] i386: Update defconfig
[PATCH] Update defconfig
Diffstat (limited to 'Documentation')
| -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 4303e0c..74b77f9 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt @@ -199,6 +199,11 @@ IOMMU allowed overwrite iommu off workarounds for specific chipsets. soft Use software bounce buffering (default for Intel machines) noaperture Don't touch the aperture for AGP. + allowdac Allow DMA >4GB + When off all DMA over >4GB is forced through an IOMMU or bounce + buffering. + nodac Forbid DMA >4GB + panic Always panic when IOMMU overflows swiotlb=pages[,force] |