vserver 1.9.3

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

diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index f381794..8876ec7 100644 (file)
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -3,7 +3,6 @@
 
 #include <linux/config.h>
 #include <linux/mm.h>
-#include <linux/device.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
 
@@ -44,6 +43,8 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
        if (dev && dev->bus == &pci_bus_type)
                return __pci_alloc_consistent(NULL, size, dma_handle);
 #endif
+       if (sh_mv.mv_consistent_alloc)
+               return sh_mv.mv_consistent_alloc(dev, size, dma_handle, flag);
 
        return consistent_alloc(flag, size, dma_handle);
 }
@@ -61,6 +62,11 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
        }
 #endif
 
+       if (sh_mv.mv_consistent_free) {
+               sh_mv.mv_consistent_free(dev, size, vaddr, dma_handle);
+               return;
+       }
+
        consistent_free(vaddr, size);
 }
 
@@ -152,6 +158,26 @@ static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
        }
 }
 
+static inline void dma_sync_single_for_cpu(struct device *dev,
+                                          dma_addr_t dma_handle, size_t size,
+                                          enum dma_data_direction dir)
+       __attribute__ ((alias("dma_sync_single")));
+
+static inline void dma_sync_single_for_device(struct device *dev,
+                                          dma_addr_t dma_handle, size_t size,
+                                          enum dma_data_direction dir)
+       __attribute__ ((alias("dma_sync_single")));
+
+static inline void dma_sync_sg_for_cpu(struct device *dev,
+                                      struct scatterlist *sg, int nelems,
+                                      enum dma_data_direction dir)
+       __attribute__ ((alias("dma_sync_sg")));
+
+static inline void dma_sync_sg_for_device(struct device *dev,
+                                      struct scatterlist *sg, int nelems,
+                                      enum dma_data_direction dir)
+       __attribute__ ((alias("dma_sync_sg")));
+
 static inline int dma_get_cache_alignment(void)
 {
        /*
@@ -161,5 +187,10 @@ static inline int dma_get_cache_alignment(void)
        return L1_CACHE_BYTES;
 }
 
+static inline int dma_mapping_error(dma_addr_t dma_addr)
+{
+       return dma_addr == 0;
+}
+
 #endif /* __ASM_SH_DMA_MAPPING_H */