aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/dma-mapping.h2
-rw-r--r--include/asm-x86/dma-mapping_64.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index c671a0aea59b..984935d86bbd 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -10,6 +10,8 @@
10#include <asm/io.h> 10#include <asm/io.h>
11#include <asm/swiotlb.h> 11#include <asm/swiotlb.h>
12 12
13extern dma_addr_t bad_dma_address;
14
13struct dma_mapping_ops { 15struct dma_mapping_ops {
14 int (*mapping_error)(dma_addr_t dma_addr); 16 int (*mapping_error)(dma_addr_t dma_addr);
15 void* (*alloc_coherent)(struct device *dev, size_t size, 17 void* (*alloc_coherent)(struct device *dev, size_t size,
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h
index 9674dac9fa3a..352bf4164a5e 100644
--- a/include/asm-x86/dma-mapping_64.h
+++ b/include/asm-x86/dma-mapping_64.h
@@ -1,7 +1,6 @@
1#ifndef _X8664_DMA_MAPPING_H 1#ifndef _X8664_DMA_MAPPING_H
2#define _X8664_DMA_MAPPING_H 1 2#define _X8664_DMA_MAPPING_H 1
3 3
4extern dma_addr_t bad_dma_address;
5extern int iommu_merge; 4extern int iommu_merge;
6 5
7static inline int dma_mapping_error(dma_addr_t dma_addr) 6static inline int dma_mapping_error(dma_addr_t dma_addr)