2 files changed, 11 insertions, 4 deletions

diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h
index 71ad34eca6e3..547ab568d3ae 100644
--- a/include/linux/dma-attrs.h
+++ b/include/linux/dma-attrs.h
@@ -13,6 +13,8 @@
 enum dma_attr {
         DMA_ATTR_WRITE_BARRIER,
         DMA_ATTR_WEAK_ORDERING,
+        DMA_ATTR_WRITE_COMBINE,
+        DMA_ATTR_NON_CONSISTENT,
         DMA_ATTR_MAX,
 };
 
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 5a736af3cc7a..dfc099e56a66 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -9,10 +9,15 @@
 #include <linux/scatterlist.h>
 
 struct dma_map_ops {
-        void* (*alloc_coherent)(struct device *dev, size_t size,
-                                dma_addr_t *dma_handle, gfp_t gfp);
-        void (*free_coherent)(struct device *dev, size_t size,
-                              void *vaddr, dma_addr_t dma_handle);
+        void* (*alloc)(struct device *dev, size_t size,
+                                dma_addr_t *dma_handle, gfp_t gfp,
+                                struct dma_attrs *attrs);
+        void (*free)(struct device *dev, size_t size,
+                              void *vaddr, dma_addr_t dma_handle,
+                              struct dma_attrs *attrs);
+        int (*mmap)(struct device *, struct vm_area_struct *,
+                          void *, dma_addr_t, size_t, struct dma_attrs *attrs);
+
         dma_addr_t (*map_page)(struct device *dev, struct page *page,
                                unsigned long offset, size_t size,
                                enum dma_data_direction dir,