aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-25 17:36:33 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 13:19:56 -0400
commit3cb6a91711a682adb3aa95da2ed8d47512cc3c41 (patch)
tree2f6a68a8392f513c047dde9df763df9a3b35c9cf
parent2be621498d461b63ca6124f86e3b9582e1a8e722 (diff)
x86: move dma_cache_sync to common header
they are the same in both architectures. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/asm-x86/dma-mapping.h6
-rw-r--r--include/asm-x86/dma-mapping_32.h7
-rw-r--r--include/asm-x86/dma-mapping_64.h7
3 files changed, 6 insertions, 14 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index b331a8d3a7cf..51a79d71dabd 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -185,4 +185,10 @@ static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
185 dma_unmap_single(dev, addr, size, direction); 185 dma_unmap_single(dev, addr, size, direction);
186} 186}
187 187
188static inline void
189dma_cache_sync(struct device *dev, void *vaddr, size_t size,
190 enum dma_data_direction dir)
191{
192 flush_write_buffers();
193}
188#endif 194#endif
diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h
index c61ae7ff222c..e60c30a88311 100644
--- a/include/asm-x86/dma-mapping_32.h
+++ b/include/asm-x86/dma-mapping_32.h
@@ -55,13 +55,6 @@ dma_get_cache_alignment(void)
55 55
56#define dma_is_consistent(d, h) (1) 56#define dma_is_consistent(d, h) (1)
57 57
58static inline void
59dma_cache_sync(struct device *dev, void *vaddr, size_t size,
60 enum dma_data_direction direction)
61{
62 flush_write_buffers();
63}
64
65#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY 58#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
66extern int 59extern int
67dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, 60dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h
index 2b4a43080db9..b1bc6ca7613d 100644
--- a/include/asm-x86/dma-mapping_64.h
+++ b/include/asm-x86/dma-mapping_64.h
@@ -24,13 +24,6 @@ static inline int dma_get_cache_alignment(void)
24 24
25extern int dma_set_mask(struct device *dev, u64 mask); 25extern int dma_set_mask(struct device *dev, u64 mask);
26 26
27static inline void
28dma_cache_sync(struct device *dev, void *vaddr, size_t size,
29 enum dma_data_direction dir)
30{
31 flush_write_buffers();
32}
33
34extern struct device fallback_dev; 27extern struct device fallback_dev;
35extern int panic_on_overflow; 28extern int panic_on_overflow;
36 29