diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-04-08 13:21:00 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:58 +0200 |
| commit | cac67877d268f21da74d879a355247e4e25b5b5f (patch) | |
| tree | bba90fa76cd127f525a0811701cde7c2eb33007d /arch/x86 | |
| parent | d09d815c1b1d437a3ea89ecd92c91179266d1243 (diff) | |
x86: move bad_dma_address
It goes to pci-dma.c, and is removed from the arch-specific files.
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 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/pci-dma_32.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/pci-dma_64.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 967dfcfa2ad2..00527e74e49c 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -35,6 +35,8 @@ int iommu_detected __read_mostly = 0; int iommu_bio_merge __read_mostly = 0; EXPORT_SYMBOL(iommu_bio_merge); +dma_addr_t bad_dma_address __read_mostly = 0; +EXPORT_SYMBOL(bad_dma_address); int dma_set_mask(struct device *dev, u64 mask) { diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c index 78c7640252a4..9199bccb9214 100644 --- a/arch/x86/kernel/pci-dma_32.c +++ b/arch/x86/kernel/pci-dma_32.c @@ -14,10 +14,6 @@ #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); - static int dma_alloc_from_coherent_mem(struct device *dev, ssize_t size, dma_addr_t *dma_handle, void **ret) { diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c index 6eacd58e451b..5f03e4174210 100644 --- a/arch/x86/kernel/pci-dma_64.c +++ b/arch/x86/kernel/pci-dma_64.c @@ -14,8 +14,6 @@ #include <asm/gart.h> #include <asm/calgary.h> -dma_addr_t bad_dma_address __read_mostly; -EXPORT_SYMBOL(bad_dma_address); /* Dummy device used for NULL arguments (normally ISA). Better would be probably a smaller DMA mask, but this is bug-to-bug compatible |