diff options
-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; | |||
35 | int iommu_bio_merge __read_mostly = 0; | 35 | int iommu_bio_merge __read_mostly = 0; |
36 | EXPORT_SYMBOL(iommu_bio_merge); | 36 | EXPORT_SYMBOL(iommu_bio_merge); |
37 | 37 | ||
38 | dma_addr_t bad_dma_address __read_mostly = 0; | ||
39 | EXPORT_SYMBOL(bad_dma_address); | ||
38 | 40 | ||
39 | int dma_set_mask(struct device *dev, u64 mask) | 41 | int dma_set_mask(struct device *dev, u64 mask) |
40 | { | 42 | { |
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 @@ | |||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
16 | 16 | ||
17 | /* For i386, we make it point to the NULL address */ | ||
18 | dma_addr_t bad_dma_address __read_mostly = 0x0; | ||
19 | EXPORT_SYMBOL(bad_dma_address); | ||
20 | |||
21 | static int dma_alloc_from_coherent_mem(struct device *dev, ssize_t size, | 17 | static int dma_alloc_from_coherent_mem(struct device *dev, ssize_t size, |
22 | dma_addr_t *dma_handle, void **ret) | 18 | dma_addr_t *dma_handle, void **ret) |
23 | { | 19 | { |
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 @@ | |||
14 | #include <asm/gart.h> | 14 | #include <asm/gart.h> |
15 | #include <asm/calgary.h> | 15 | #include <asm/calgary.h> |
16 | 16 | ||
17 | dma_addr_t bad_dma_address __read_mostly; | ||
18 | EXPORT_SYMBOL(bad_dma_address); | ||
19 | 17 | ||
20 | /* Dummy device used for NULL arguments (normally ISA). Better would | 18 | /* Dummy device used for NULL arguments (normally ISA). Better would |
21 | be probably a smaller DMA mask, but this is bug-to-bug compatible | 19 | be probably a smaller DMA mask, but this is bug-to-bug compatible |