From 37114819e1073f760ed8ac9231db8557b05c44df Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 8 Apr 2008 13:21:00 -0300 Subject: [PATCH] --- yaml --- r: 91031 b: refs/heads/master c: cac67877d268f21da74d879a355247e4e25b5b5f h: refs/heads/master i: 91029: e607a5bded32ce244138b99e3163bde899f10134 91027: d0828b41f6a89af7948bc4c14393e15a25748f75 91023: e156032d7767a504ee902f63e278a4bc44d9fe5e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-dma.c | 2 ++ trunk/arch/x86/kernel/pci-dma_32.c | 4 ---- trunk/arch/x86/kernel/pci-dma_64.c | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index da69ff250b6b..acd420a70bd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d09d815c1b1d437a3ea89ecd92c91179266d1243 +refs/heads/master: cac67877d268f21da74d879a355247e4e25b5b5f diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c index 967dfcfa2ad2..00527e74e49c 100644 --- a/trunk/arch/x86/kernel/pci-dma.c +++ b/trunk/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/trunk/arch/x86/kernel/pci-dma_32.c b/trunk/arch/x86/kernel/pci-dma_32.c index 78c7640252a4..9199bccb9214 100644 --- a/trunk/arch/x86/kernel/pci-dma_32.c +++ b/trunk/arch/x86/kernel/pci-dma_32.c @@ -14,10 +14,6 @@ #include #include -/* 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/trunk/arch/x86/kernel/pci-dma_64.c b/trunk/arch/x86/kernel/pci-dma_64.c index 6eacd58e451b..5f03e4174210 100644 --- a/trunk/arch/x86/kernel/pci-dma_64.c +++ b/trunk/arch/x86/kernel/pci-dma_64.c @@ -14,8 +14,6 @@ #include #include -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