]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: move ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY to dma-mapping.h
authorGlauber Costa <gcosta@redhat.com>
Tue, 25 Mar 2008 21:36:38 +0000 (18:36 -0300)
committerIngo Molnar <mingo@elte.hu>
Sat, 19 Apr 2008 17:19:57 +0000 (19:19 +0200)
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>
include/asm-x86/dma-mapping.h
include/asm-x86/dma-mapping_32.h

index a7090bbb2a2df44cf4db2170fc8931a2041d94e8..1c88ce6b50d62cdbbe70286fa7ecdc961de80602 100644 (file)
@@ -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
index 03a75f8665349c05db6b50c2d1b9f1a0d0f72f08..4ec4f45446cf7250cce64d05f8b0f25c924f02e6 100644 (file)
@@ -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