diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 18:36:36 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:56 +0200 |
| commit | 7c18341665917b493fa40eeb3c7ff6c1a5ac47db (patch) | |
| tree | f027237e256fe89ca03b83f8eb32978560b092da | |
| parent | b48ee7135230ac43b6820d59a784ac0bd51ae552 (diff) | |
| download | op-kernel-dev-7c18341665917b493fa40eeb3c7ff6c1a5ac47db.zip op-kernel-dev-7c18341665917b493fa40eeb3c7ff6c1a5ac47db.tar.gz | |
x86: provide a bad_dma_address symbol for i386
It's initially 0, since we don't expect any DMA there.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/pci-dma_32.c | 4 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_64.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c index 453b4bd..55ab3c8 100644 --- a/arch/x86/kernel/pci-dma_32.c +++ b/arch/x86/kernel/pci-dma_32.c @@ -14,6 +14,10 @@ #include <linux/module.h> #include <asm/io.h> +/* For i386, we make it point to the NULL address */ +dma_addr_t bad_dma_address __read_mostly = 0x0; +EXPORT_SYMBOL(bad_dma_address); + struct dma_coherent_mem { void *virt_base; u32 device_base; diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index c671a0a..984935d 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h @@ -10,6 +10,8 @@ #include <asm/io.h> #include <asm/swiotlb.h> +extern dma_addr_t bad_dma_address; + struct dma_mapping_ops { int (*mapping_error)(dma_addr_t dma_addr); void* (*alloc_coherent)(struct device *dev, size_t size, diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h index 9674dac..352bf41 100644 --- a/include/asm-x86/dma-mapping_64.h +++ b/include/asm-x86/dma-mapping_64.h @@ -1,7 +1,6 @@ #ifndef _X8664_DMA_MAPPING_H #define _X8664_DMA_MAPPING_H 1 -extern dma_addr_t bad_dma_address; extern int iommu_merge; static inline int dma_mapping_error(dma_addr_t dma_addr) |
