From ed6de12bf027997b29c0b5b19f6008d4a69a1c65 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 30 Sep 2006 01:47:55 +0200 Subject: [PATCH] --- yaml --- r: 37230 b: refs/heads/master c: d802ab981da67d433fbb48f5640b7e3a9ba9fd54 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/x86_64/boot-options.txt | 1 + trunk/arch/x86_64/kernel/pci-dma.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0ae07ceb06b0..e42095ea6016 100644 --- 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 index e97a4c8fe6ea..74b77f9e91bc 100644 --- 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 index 58be7929b4e2..f8d857453f8a 100644 --- 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) {