5 files changed, 10 insertions, 11 deletions

diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c
index 099212d4567c..177fea8f7b71 100644
--- a/arch/avr32/mm/dma-coherent.c
+++ b/arch/avr32/mm/dma-coherent.c
@@ -21,13 +21,13 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, int direction)
 
         switch (direction) {
         case DMA_FROM_DEVICE:           /* invalidate only */
-                dma_cache_inv(vaddr, size);
+                invalidate_dcache_region(vaddr, size);
                 break;
         case DMA_TO_DEVICE:             /* writeback only */
-                dma_cache_wback(vaddr, size);
+                clean_dcache_region(vaddr, size);
                 break;
         case DMA_BIDIRECTIONAL:         /* writeback and invalidate */
-                dma_cache_wback_inv(vaddr, size);
+                flush_dcache_region(vaddr, size);
                 break;
         default:
                 BUG();
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 43dde874f414..81f30ac2bff9 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -47,8 +47,6 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size);
 void (*_dma_cache_inv)(unsigned long start, unsigned long size);
 
 EXPORT_SYMBOL(_dma_cache_wback_inv);
-EXPORT_SYMBOL(_dma_cache_wback);
-EXPORT_SYMBOL(_dma_cache_inv);
 
 #endif /* CONFIG_DMA_NONCOHERENT */
 
diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c
index 230d6ec0d239..888a34050599 100644
--- a/arch/sh/drivers/pci/dma-dreamcast.c
+++ b/arch/sh/drivers/pci/dma-dreamcast.c
@@ -51,7 +51,7 @@ void *dreamcast_consistent_alloc(struct device *dev, size_t size,
         buf = P2SEGADDR(buf);
 
         /* Flush the dcache before we hand off the buffer */
-        dma_cache_wback_inv((void *)buf, size);
+        __flush_purge_region((void *)buf, size);
 
         return (void *)buf;
 }
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index 38c82d890ffd..e220c29a3c00 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -34,7 +34,7 @@ void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
         /*
          * We must flush the cache before we pass it on to the device
          */
-        dma_cache_wback_inv(ret, size);
+        __flush_purge_region(ret, size);
 
         page = virt_to_page(ret);
         free = page + (size >> PAGE_SHIFT);
@@ -68,13 +68,13 @@ void consistent_sync(void *vaddr, size_t size, int direction)
 
         switch (direction) {
         case DMA_FROM_DEVICE:           /* invalidate only */
-                dma_cache_inv(p1addr, size);
+                __flush_invalidate_region(p1addr, size);
                 break;
         case DMA_TO_DEVICE:             /* writeback only */
-                dma_cache_wback(p1addr, size);
+                __flush_wback_region(p1addr, size);
                 break;
         case DMA_BIDIRECTIONAL:         /* writeback and invalidate */
-                dma_cache_wback_inv(p1addr, size);
+                __flush_purge_region(p1addr, size);
                 break;
         default:
                 BUG();
diff --git a/arch/sh64/mm/consistent.c b/arch/sh64/mm/consistent.c
index 8875a2a40da7..c439620402cb 100644
--- a/arch/sh64/mm/consistent.c
+++ b/arch/sh64/mm/consistent.c
@@ -11,6 +11,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <asm/io.h>
 
@@ -32,7 +33,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size,
         if (vp != NULL) {
                 memset(vp, 0, size);
                 *dma_handle = virt_to_phys(ret);
-                dma_cache_wback_inv((unsigned long)ret, size);
+                dma_cache_sync(NULL, ret, size, DMA_BIDIRECTIONAL);
         }
 
         return vp;