Skip to content

Commit

Permalink
x86: provide a bad_dma_address symbol for i386
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 19, 2008
1 parent b48ee71 commit 7c18341
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions arch/x86/kernel/pci-dma_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions include/asm-x86/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion include/asm-x86/dma-mapping_64.h
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 7c18341

Please sign in to comment.