linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / dma-mapping.h

diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h
index 55eb4dc..e3e8541 100644 (file)
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@ -3,6 +3,7 @@
 
 #ifdef __KERNEL__
 
+#include <linux/config.h>
 #include <linux/mm.h> /* need struct page */
 
 #include <asm/scatterlist.h>
@@ -46,7 +47,7 @@ static inline int dma_get_cache_alignment(void)
 
 static inline int dma_is_consistent(dma_addr_t handle)
 {
-       return !!arch_is_coherent();
+       return 0;
 }
 
 /*
@@ -144,9 +145,7 @@ static inline dma_addr_t
 dma_map_single(struct device *dev, void *cpu_addr, size_t size,
               enum dma_data_direction dir)
 {
-       if (!arch_is_coherent())
-               consistent_sync(cpu_addr, size, dir);
-
+       consistent_sync(cpu_addr, size, dir);
        return virt_to_dma(dev, (unsigned long)cpu_addr);
 }
 #else
@@ -256,9 +255,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 
                sg->dma_address = page_to_dma(dev, sg->page) + sg->offset;
                virt = page_address(sg->page) + sg->offset;
-
-               if (!arch_is_coherent())
-                       consistent_sync(virt, sg->length, dir);
+               consistent_sync(virt, sg->length, dir);
        }
 
        return nents;
@@ -313,16 +310,14 @@ static inline void
 dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size,
                        enum dma_data_direction dir)
 {
-       if (!arch_is_coherent())
-               consistent_sync((void *)dma_to_virt(dev, handle), size, dir);
+       consistent_sync((void *)dma_to_virt(dev, handle), size, dir);
 }
 
 static inline void
 dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,
                           enum dma_data_direction dir)
 {
-       if (!arch_is_coherent())
-               consistent_sync((void *)dma_to_virt(dev, handle), size, dir);
+       consistent_sync((void *)dma_to_virt(dev, handle), size, dir);
 }
 #else
 extern void dma_sync_single_for_cpu(struct device*, dma_addr_t, size_t, enum dma_data_direction);
@@ -352,8 +347,7 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,
 
        for (i = 0; i < nents; i++, sg++) {
                char *virt = page_address(sg->page) + sg->offset;
-               if (!arch_is_coherent())
-                       consistent_sync(virt, sg->length, dir);
+               consistent_sync(virt, sg->length, dir);
        }
 }
 
@@ -365,8 +359,7 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,
 
        for (i = 0; i < nents; i++, sg++) {
                char *virt = page_address(sg->page) + sg->offset;
-               if (!arch_is_coherent())
-                       consistent_sync(virt, sg->length, dir);
+               consistent_sync(virt, sg->length, dir);
        }
 }
 #else