diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-04-08 12:20:56 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:57 -0400 |
commit | fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899 (patch) | |
tree | a16bbeabb8b77e96e040ddc900a03ae5879fe784 /include/asm-x86/dma-mapping.h | |
parent | 8e0c379718ef32967deea55937895bfc9b493dd8 (diff) |
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/asm-x86/dma-mapping.h')
-rw-r--r-- | include/asm-x86/dma-mapping.h | 1 |
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; | |||
15 | extern struct device fallback_dev; | 15 | extern struct device fallback_dev; |
16 | extern int panic_on_overflow; | 16 | extern int panic_on_overflow; |
17 | extern int forbid_dac; | 17 | extern int forbid_dac; |
18 | extern int force_iommu; | ||
18 | 19 | ||
19 | struct dma_mapping_ops { | 20 | struct dma_mapping_ops { |
20 | int (*mapping_error)(dma_addr_t dma_addr); | 21 | int (*mapping_error)(dma_addr_t dma_addr); |