diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 18:36:39 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:57 +0200 |
| commit | b7107a3d9da2e122fb7f33dd1482254ff40fdf96 (patch) | |
| tree | bc8169295d26a7e6f49b16a3688846e4f0841347 | |
| parent | ae17a63b096b05007bacafd2f92414b881a0b4b4 (diff) | |
x86: delete the arch-specific dma-mapping headers.
all the code that is left is ready to be merged as-is
in dma-mapping.h.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 19 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_32.h | 23 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_64.h | 17 |
3 files changed, 13 insertions, 46 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index 1c88ce6b50d..914846d0bea 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h @@ -11,6 +11,9 @@ #include <asm/swiotlb.h> extern dma_addr_t bad_dma_address; +extern int iommu_merge; +extern struct device fallback_dev; +extern int panic_on_overflow; struct dma_mapping_ops { int (*mapping_error)(dma_addr_t dma_addr); @@ -75,12 +78,6 @@ void dma_free_coherent(struct device *dev, size_t size, extern int dma_supported(struct device *hwdev, u64 mask); extern int dma_set_mask(struct device *dev, u64 mask); -#ifdef CONFIG_X86_32 -# include "dma-mapping_32.h" -#else -# include "dma-mapping_64.h" -#endif - static inline dma_addr_t dma_map_single(struct device *hwdev, void *ptr, size_t size, int direction) @@ -205,6 +202,15 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size, flush_write_buffers(); } +static inline int dma_get_cache_alignment(void) +{ + /* no easy way to get cache size on all x86, so return the + * maximum possible, to be safe */ + return boot_cpu_data.x86_clflush_size; +} + +#define dma_is_consistent(d, h) (1) + #ifdef CONFIG_X86_32 # define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY extern int @@ -217,5 +223,6 @@ dma_release_declared_memory(struct device *dev); extern void * dma_mark_declared_memory_occupied(struct device *dev, dma_addr_t device_addr, size_t size); +extern int forbid_dac; #endif /* CONFIG_X86_32 */ #endif diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h deleted file mode 100644 index 4ec4f45446c..00000000000 --- a/include/asm-x86/dma-mapping_32.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _ASM_I386_DMA_MAPPING_H -#define _ASM_I386_DMA_MAPPING_H - -#include <linux/mm.h> -#include <linux/scatterlist.h> - -#include <asm/cache.h> -#include <asm/io.h> -#include <asm/bug.h> - -extern int forbid_dac; - -static inline int -dma_get_cache_alignment(void) -{ - /* no easy way to get cache size on all x86, so return the - * maximum possible, to be safe */ - return boot_cpu_data.x86_clflush_size; -} - -#define dma_is_consistent(d, h) (1) - -#endif diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h deleted file mode 100644 index 8353025f052..00000000000 --- a/include/asm-x86/dma-mapping_64.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _X8664_DMA_MAPPING_H -#define _X8664_DMA_MAPPING_H 1 - -extern int iommu_merge; - -/* same for gart, swiotlb, and nommu */ -static inline int dma_get_cache_alignment(void) -{ - return boot_cpu_data.x86_clflush_size; -} - -#define dma_is_consistent(d, h) 1 - -extern struct device fallback_dev; -extern int panic_on_overflow; - -#endif /* _X8664_DMA_MAPPING_H */ |