diff options
-rw-r--r-- | Documentation/x86_64/boot-options.txt | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/pci-dma.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index e97a4c8fe6ea..74b77f9e91bc 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
@@ -203,6 +203,7 @@ IOMMU | |||
203 | When off all DMA over >4GB is forced through an IOMMU or bounce | 203 | When off all DMA over >4GB is forced through an IOMMU or bounce |
204 | buffering. | 204 | buffering. |
205 | nodac Forbid DMA >4GB | 205 | nodac Forbid DMA >4GB |
206 | panic Always panic when IOMMU overflows | ||
206 | 207 | ||
207 | swiotlb=pages[,force] | 208 | swiotlb=pages[,force] |
208 | 209 | ||
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c index 58be7929b4e2..f8d857453f8a 100644 --- a/arch/x86_64/kernel/pci-dma.c +++ b/arch/x86_64/kernel/pci-dma.c | |||
@@ -245,6 +245,7 @@ EXPORT_SYMBOL(dma_set_mask); | |||
245 | noaperture Don't touch the aperture for AGP. | 245 | noaperture Don't touch the aperture for AGP. |
246 | allowdac Allow DMA >4GB | 246 | allowdac Allow DMA >4GB |
247 | nodac Forbid DMA >4GB | 247 | nodac Forbid DMA >4GB |
248 | panic Force panic when IOMMU overflows | ||
248 | */ | 249 | */ |
249 | __init int iommu_setup(char *p) | 250 | __init int iommu_setup(char *p) |
250 | { | 251 | { |