Home » Mailing list archives » linux-kernel » 2008 » March » 25

[PATCH 19/20] x86: move ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY to dma-mapping.h

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Glauber Costa <gcosta@...>
To: <linux-kernel@...>
Cc: <akpm@...>, <glommer@...>, <mingo@...>, <tglx@...>, <kvm-devel@...>, <avi@...>, <amit.shah@...>
Subject: [PATCH 19/20] x86: move ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY to dma-mapping.h
Date: Tuesday, March 25, 2008 - 5:36 pm

define it conditionally to i386

Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
 include/asm-x86/dma-mapping.h    |   14 ++++++++++++++
 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 352433b..9548b19 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -202,4 +202,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 03a75f8..4ec4f45 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
-- 
1.5.0.6

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 18/20] x86: unify dma_mapping_error, Glauber Costa, (Tue Mar 25, 5:36 pm)
[PATCH 19/20] x86: move ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY..., Glauber Costa, (Tue Mar 25, 5:36 pm)