---

yaml --- r: 37230 b: refs/heads/master c: d802ab9 h: refs/heads/master v: v3
git-mirror · Sep 29, 2006 · ed6de12 · ed6de12
1 parent 0d7cb07
commit ed6de12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ded318ec80071557155604197ea45dcdb2a9ff2f
+refs/heads/master: d802ab981da67d433fbb48f5640b7e3a9ba9fd54
diff --git a/trunk/Documentation/x86_64/boot-options.txt b/trunk/Documentation/x86_64/boot-options.txt
@@ -203,6 +203,7 @@ IOMMU
 	    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]
 

diff --git a/trunk/arch/x86_64/kernel/pci-dma.c b/trunk/arch/x86_64/kernel/pci-dma.c
@@ -245,6 +245,7 @@ EXPORT_SYMBOL(dma_set_mask);
    noaperture Don't touch the aperture for AGP.
    allowdac Allow DMA >4GB
    nodac    Forbid DMA >4GB
+   panic    Force panic when IOMMU overflows
 */
 __init int iommu_setup(char *p)
 {