Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
  dma-debug: make memory range checks more consistent
  dma-debug: warn of unmapping an invalid dma address
  dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG
  dma-debug/x86: register pci bus for dma-debug leak detection
  dma-debug: add a check dma memory leaks
  dma-debug: add checks for kernel text and rodata
  dma-debug: print stacktrace of mapping path on unmap error
  dma-debug: Documentation update
  dma-debug: x86 architecture bindings
  dma-debug: add function to dump dma mappings
  dma-debug: add checks for sync_single_sg_*
  dma-debug: add checks for sync_single_range_*
  dma-debug: add checks for sync_single_*
  dma-debug: add checking for [alloc|free]_coherent
  dma-debug: add add checking for map/unmap_sg
  dma-debug: add checking for map/unmap_page/single
  dma-debug: add core checking functions
  dma-debug: add debugfs interface
  dma-debug: add kernel command line parameters
  dma-debug: add initialization code
  ...

Fix trivial conflicts due to whitespace changes in arch/x86/kernel/pci-nommu.c

1 files changed, 48 insertions, 0 deletions

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index ba9114ec5d3a..d7d090d21031 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -3,6 +3,8 @@
 
 #include <linux/device.h>
 #include <linux/err.h>
+#include <linux/dma-attrs.h>
+#include <linux/scatterlist.h>
 
 /* These definitions mirror those in pci.h, so they can be used
  * interchangeably with their PCI_ counterparts */
@@ -13,6 +15,52 @@ enum dma_data_direction {
         DMA_NONE = 3,
 };
 
+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);
+        dma_addr_t (*map_page)(struct device *dev, struct page *page,
+                               unsigned long offset, size_t size,
+                               enum dma_data_direction dir,
+                               struct dma_attrs *attrs);
+        void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
+                           size_t size, enum dma_data_direction dir,
+                           struct dma_attrs *attrs);
+        int (*map_sg)(struct device *dev, struct scatterlist *sg,
+                      int nents, enum dma_data_direction dir,
+                      struct dma_attrs *attrs);
+        void (*unmap_sg)(struct device *dev,
+                         struct scatterlist *sg, int nents,
+                         enum dma_data_direction dir,
+                         struct dma_attrs *attrs);
+        void (*sync_single_for_cpu)(struct device *dev,
+                                    dma_addr_t dma_handle, size_t size,
+                                    enum dma_data_direction dir);
+        void (*sync_single_for_device)(struct device *dev,
+                                       dma_addr_t dma_handle, size_t size,
+                                       enum dma_data_direction dir);
+        void (*sync_single_range_for_cpu)(struct device *dev,
+                                          dma_addr_t dma_handle,
+                                          unsigned long offset,
+                                          size_t size,
+                                          enum dma_data_direction dir);
+        void (*sync_single_range_for_device)(struct device *dev,
+                                             dma_addr_t dma_handle,
+                                             unsigned long offset,
+                                             size_t size,
+                                             enum dma_data_direction dir);
+        void (*sync_sg_for_cpu)(struct device *dev,
+                                struct scatterlist *sg, int nents,
+                                enum dma_data_direction dir);
+        void (*sync_sg_for_device)(struct device *dev,
+                                   struct scatterlist *sg, int nents,
+                                   enum dma_data_direction dir);
+        int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
+        int (*dma_supported)(struct device *dev, u64 mask);
+        int is_phys;
+};
+
 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 
 /*