netfilter: nf_conntrack: fix hash resizing with namespaces

[safe/jmp/linux-2.6] / include / linux / dma-debug.h

diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index cb72dfd..171ad8a 100644 (file)
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -24,11 +24,16 @@
 
 struct device;
 struct scatterlist;
+struct bus_type;
 
 #ifdef CONFIG_DMA_API_DEBUG
 
+extern void dma_debug_add_bus(struct bus_type *bus);
+
 extern void dma_debug_init(u32 num_entries);
 
+extern int dma_debug_resize_entries(u32 num_entries);
+
 extern void debug_dma_map_page(struct device *dev, struct page *page,
                               size_t offset, size_t size,
                               int direction, dma_addr_t dma_addr,
@@ -49,12 +54,50 @@ extern void debug_dma_alloc_coherent(struct device *dev, size_t size,
 extern void debug_dma_free_coherent(struct device *dev, size_t size,
                                    void *virt, dma_addr_t addr);
 
+extern void debug_dma_sync_single_for_cpu(struct device *dev,
+                                         dma_addr_t dma_handle, size_t size,
+                                         int direction);
+
+extern void debug_dma_sync_single_for_device(struct device *dev,
+                                            dma_addr_t dma_handle,
+                                            size_t size, int direction);
+
+extern void debug_dma_sync_single_range_for_cpu(struct device *dev,
+                                               dma_addr_t dma_handle,
+                                               unsigned long offset,
+                                               size_t size,
+                                               int direction);
+
+extern void debug_dma_sync_single_range_for_device(struct device *dev,
+                                                  dma_addr_t dma_handle,
+                                                  unsigned long offset,
+                                                  size_t size, int direction);
+
+extern void debug_dma_sync_sg_for_cpu(struct device *dev,
+                                     struct scatterlist *sg,
+                                     int nelems, int direction);
+
+extern void debug_dma_sync_sg_for_device(struct device *dev,
+                                        struct scatterlist *sg,
+                                        int nelems, int direction);
+
+extern void debug_dma_dump_mappings(struct device *dev);
+
 #else /* CONFIG_DMA_API_DEBUG */
 
+static inline void dma_debug_add_bus(struct bus_type *bus)
+{
+}
+
 static inline void dma_debug_init(u32 num_entries)
 {
 }
 
+static inline int dma_debug_resize_entries(u32 num_entries)
+{
+       return 0;
+}
+
 static inline void debug_dma_map_page(struct device *dev, struct page *page,
                                      size_t offset, size_t size,
                                      int direction, dma_addr_t dma_addr,
@@ -89,6 +132,50 @@ static inline void debug_dma_free_coherent(struct device *dev, size_t size,
 {
 }
 
+static inline void debug_dma_sync_single_for_cpu(struct device *dev,
+                                                dma_addr_t dma_handle,
+                                                size_t size, int direction)
+{
+}
+
+static inline void debug_dma_sync_single_for_device(struct device *dev,
+                                                   dma_addr_t dma_handle,
+                                                   size_t size, int direction)
+{
+}
+
+static inline void debug_dma_sync_single_range_for_cpu(struct device *dev,
+                                                      dma_addr_t dma_handle,
+                                                      unsigned long offset,
+                                                      size_t size,
+                                                      int direction)
+{
+}
+
+static inline void debug_dma_sync_single_range_for_device(struct device *dev,
+                                                         dma_addr_t dma_handle,
+                                                         unsigned long offset,
+                                                         size_t size,
+                                                         int direction)
+{
+}
+
+static inline void debug_dma_sync_sg_for_cpu(struct device *dev,
+                                            struct scatterlist *sg,
+                                            int nelems, int direction)
+{
+}
+
+static inline void debug_dma_sync_sg_for_device(struct device *dev,
+                                               struct scatterlist *sg,
+                                               int nelems, int direction)
+{
+}
+
+static inline void debug_dma_dump_mappings(struct device *dev)
+{
+}
+
 #endif /* CONFIG_DMA_API_DEBUG */
 
 #endif /* __DMA_DEBUG_H */