diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-06-29 06:19:31 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-30 06:51:07 -0400 |
commit | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 (patch) | |
tree | 81ecd6918ebf9022af054ff18b06c856e0e6c54b /include/asm-x86/dma-mapping.h | |
parent | ee7e5516be4f2107535ad5a3d47d9c79f93661a2 (diff) |
x86: use generic per-device dma coherent allocator
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/dma-mapping.h')
-rw-r--r-- | include/asm-x86/dma-mapping.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index a1a4dc7fe6e..c68f360ef56 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
@@ -213,25 +213,5 @@ static inline int dma_get_cache_alignment(void) | |||
213 | 213 | ||
214 | #define dma_is_consistent(d, h) (1) | 214 | #define dma_is_consistent(d, h) (1) |
215 | 215 | ||
216 | #ifdef CONFIG_X86_32 | 216 | #include <asm-generic/dma-coherent.h> |
217 | # define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY | ||
218 | struct dma_coherent_mem { | ||
219 | void *virt_base; | ||
220 | u32 device_base; | ||
221 | int size; | ||
222 | int flags; | ||
223 | unsigned long *bitmap; | ||
224 | }; | ||
225 | |||
226 | extern int | ||
227 | dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, | ||
228 | dma_addr_t device_addr, size_t size, int flags); | ||
229 | |||
230 | extern void | ||
231 | dma_release_declared_memory(struct device *dev); | ||
232 | |||
233 | extern void * | ||
234 | dma_mark_declared_memory_occupied(struct device *dev, | ||
235 | dma_addr_t device_addr, size_t size); | ||
236 | #endif /* CONFIG_X86_32 */ | ||
237 | #endif | 217 | #endif |