diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 18:36:38 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:57 +0200 |
| commit | ae17a63b096b05007bacafd2f92414b881a0b4b4 (patch) | |
| tree | c945afe5e66407cd3b4b8a5ea33fcae08a30c579 /include/asm-x86 | |
| parent | c786df08f6df2833e34e78cee5ef62558e3b5346 (diff) | |
| download | linux-ae17a63b096b05007bacafd2f92414b881a0b4b4.tar.bz2 | |
x86: move ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY to dma-mapping.h
define it conditionally to i386.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 14 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_32.h | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index a7090bbb2a2d..1c88ce6b50d6 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h @@ -204,4 +204,18 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size, { flush_write_buffers(); } + +#ifdef CONFIG_X86_32 +# define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY +extern int +dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, + dma_addr_t device_addr, size_t size, int flags); + +extern void +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); +#endif /* CONFIG_X86_32 */ #endif diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h index 03a75f866534..4ec4f45446cf 100644 --- a/include/asm-x86/dma-mapping_32.h +++ b/include/asm-x86/dma-mapping_32.h @@ -20,16 +20,4 @@ dma_get_cache_alignment(void) #define dma_is_consistent(d, h) (1) -#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY -extern int -dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, - dma_addr_t device_addr, size_t size, int flags); - -extern void -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); - #endif |