From dbd86edd0a38e8c91c664459f1d3e8ad062bb7c2 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 25 Mar 2008 18:36:33 -0300
Subject: [PATCH] --- yaml --- r: 91007 b: refs/heads/master c:
 3cb6a91711a682adb3aa95da2ed8d47512cc3c41 h: refs/heads/master i:   91005:
 b225cdce868e0c760d11be15b17c2661a8a44704   91003:
 c4fa5b5fe401452ff2fed505fe7cd66b3634fc03   90999:
 8ebebe7e61c75c2ce68700648177d7241caf8d5e   90991:
 53c90bfae223e78143166d0e5407f36a6d8fb0af   90975:
 d5b7a63abf35c65ba7fed3f6c74460b6854ea6fc   90943:
 873d820d9592d0be4ceee52c89d37c26abab2b7e   90879:
 a0883290f6ce63e36eb0a9a0197716b2810d5b49 v: v3

---
 [refs]                                 | 2 +-
 trunk/include/asm-x86/dma-mapping.h    | 6 ++++++
 trunk/include/asm-x86/dma-mapping_32.h | 7 -------
 trunk/include/asm-x86/dma-mapping_64.h | 7 -------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 1cceb3bd3fe5..0c11dae6d61e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2be621498d461b63ca6124f86e3b9582e1a8e722
+refs/heads/master: 3cb6a91711a682adb3aa95da2ed8d47512cc3c41
diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h
index b331a8d3a7cf..51a79d71dabd 100644
--- a/trunk/include/asm-x86/dma-mapping.h
+++ b/trunk/include/asm-x86/dma-mapping.h
@@ -185,4 +185,10 @@ static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
 	dma_unmap_single(dev, addr, size, direction);
 }
 
+static inline void
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+	enum dma_data_direction dir)
+{
+	flush_write_buffers();
+}
 #endif
diff --git a/trunk/include/asm-x86/dma-mapping_32.h b/trunk/include/asm-x86/dma-mapping_32.h
index c61ae7ff222c..e60c30a88311 100644
--- a/trunk/include/asm-x86/dma-mapping_32.h
+++ b/trunk/include/asm-x86/dma-mapping_32.h
@@ -55,13 +55,6 @@ dma_get_cache_alignment(void)
 
 #define dma_is_consistent(d, h)	(1)
 
-static inline void
-dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-	       enum dma_data_direction direction)
-{
-	flush_write_buffers();
-}
-
 #define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
 extern int
 dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
diff --git a/trunk/include/asm-x86/dma-mapping_64.h b/trunk/include/asm-x86/dma-mapping_64.h
index 2b4a43080db9..b1bc6ca7613d 100644
--- a/trunk/include/asm-x86/dma-mapping_64.h
+++ b/trunk/include/asm-x86/dma-mapping_64.h
@@ -24,13 +24,6 @@ static inline int dma_get_cache_alignment(void)
 
 extern int dma_set_mask(struct device *dev, u64 mask);
 
-static inline void
-dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-	enum dma_data_direction dir)
-{
-	flush_write_buffers();
-}
-
 extern struct device fallback_dev;
 extern int panic_on_overflow;