summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber Costa2008-04-08 18:20:56 +0200
committerIngo Molnar2008-04-19 19:19:57 +0200
commitfae9a0d8ca68a14da8d2351ad3e0bf42f3b29899 (patch)
treea16bbeabb8b77e96e040ddc900a03ae5879fe784 /include
parentx86: merge dma_supported (diff)
downloadkernel-qcow2-linux-fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899.tar.gz
kernel-qcow2-linux-fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899.tar.xz
kernel-qcow2-linux-fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899.zip
x86: merge iommu initialization parameters
we merge the iommu initialization parameters in pci-dma.c Nice thing, that both architectures at least recognize the same parameters. usedac i386 parameter is marked for deprecation Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/dma-mapping.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index d82517de1e7c..75807368051a 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -15,6 +15,7 @@ extern int iommu_merge;
extern struct device fallback_dev;
extern int panic_on_overflow;
extern int forbid_dac;
+extern int force_iommu;
struct dma_mapping_ops {
int (*mapping_error)(dma_addr_t dma_addr);