Skip to content

Commit

Permalink
x86: move bad_dma_address
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 19, 2008
1 parent d09d815 commit cac6787
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 2 additions & 0 deletions arch/x86/kernel/pci-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 0 additions & 4 deletions arch/x86/kernel/pci-dma_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 0 additions & 2 deletions arch/x86/kernel/pci-dma_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cac6787

Please sign in to comment.