diff options
Diffstat (limited to 'arch/x86/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/x86/include/asm/dma-mapping.h | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 6a25d5d4283..0f6c02f3b7d 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -20,7 +20,8 @@  # define ISA_DMA_BIT_MASK DMA_BIT_MASK(32)  #endif -extern dma_addr_t bad_dma_address; +#define DMA_ERROR_CODE	0 +  extern int iommu_merge;  extern struct device x86_dma_fallback_dev;  extern int panic_on_overflow; @@ -48,7 +49,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)  	if (ops->mapping_error)  		return ops->mapping_error(dev, dma_addr); -	return (dma_addr == bad_dma_address); +	return (dma_addr == DMA_ERROR_CODE);  }  #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)  |