aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-10-17 02:29:42 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:57 -0400
commit622a9edd919de98ef59571ae6c40c7458244e3f2 (patch)
treec25684f90ed52c459c39d97d6ab641fe3bb6b09d /include/asm-x86
parentbc154b1efb7f8430ea9faabd5953ebc411f8ead5 (diff)
Remove dma_cache_(wback|inv|wback_inv) functions
dma_cache_(wback|inv|wback_inv) were the earliest attempt on a generalized cache managment API for I/O purposes. Originally it was basically the raw MIPS low level cache API exported to the entire world. The API has suffered from a lack of documentation, was not very widely used unlike it's more modern brothers and can easily be replaced by dma_cache_sync. So remove it rsp. turn the surviving bits back into an arch private API, as discussed on linux-arch. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Paul Mackerras <paulus@samba.org> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Kyle McMartin <kyle@parisc-linux.org> Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/io_32.h11
-rw-r--r--include/asm-x86/io_64.h6
2 files changed, 1 insertions, 16 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h
index e8e0bd641120..4ea7b1ad3c1d 100644
--- a/include/asm-x86/io_32.h
+++ b/include/asm-x86/io_32.h
@@ -237,18 +237,9 @@ static inline void flush_write_buffers(void)
237 __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory"); 237 __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory");
238} 238}
239 239
240#define dma_cache_inv(_start,_size) flush_write_buffers()
241#define dma_cache_wback(_start,_size) flush_write_buffers()
242#define dma_cache_wback_inv(_start,_size) flush_write_buffers()
243
244#else 240#else
245 241
246/* Nothing to do */ 242#define flush_write_buffers() do { } while (0)
247
248#define dma_cache_inv(_start,_size) do { } while (0)
249#define dma_cache_wback(_start,_size) do { } while (0)
250#define dma_cache_wback_inv(_start,_size) do { } while (0)
251#define flush_write_buffers()
252 243
253#endif 244#endif
254 245
diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h
index 7475095c5061..a037b0794332 100644
--- a/include/asm-x86/io_64.h
+++ b/include/asm-x86/io_64.h
@@ -249,12 +249,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c);
249 */ 249 */
250#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) 250#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
251 251
252/* Nothing to do */
253
254#define dma_cache_inv(_start,_size) do { } while (0)
255#define dma_cache_wback(_start,_size) do { } while (0)
256#define dma_cache_wback_inv(_start,_size) do { } while (0)
257
258#define flush_write_buffers() 252#define flush_write_buffers()
259 253
260extern int iommu_bio_merge; 254extern int iommu_bio_merge;