diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-04-08 13:20:56 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:57 +0200 |
| commit | fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899 (patch) | |
| tree | a16bbeabb8b77e96e040ddc900a03ae5879fe784 /include/asm-x86 | |
| parent | 8e0c379718ef32967deea55937895bfc9b493dd8 (diff) | |
| download | kernel_samsung_aries-fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899.zip kernel_samsung_aries-fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899.tar.gz kernel_samsung_aries-fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899.tar.bz2 | |
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')
| -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 d82517d..7580736 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); |