diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-01-27 04:33:25 -0500 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-01-29 02:27:40 -0500 |
commit | 546eda4bcae047bf443d2cb449291416f49b14a1 (patch) | |
tree | 38790a3e407df928e71f58db7bdd4fcf6f2377ad /arch/m68k/include | |
parent | 5fd381126e4b6da3f431527ffe95271875eec98e (diff) |
m68k: Provide dma_mmap_coherent() and dma_get_sgtable()
m68k/allmodconfig:
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_mmap’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit declaration of function ‘dma_mmap_coherent’
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_get_base_sgt’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function ‘dma_get_sgtable’
For architectures using dma_map_ops, dma_mmap_coherent() and
dma_get_sgtable() are provided in <asm-generic/dma-mapping-common.h>.
M68k does not use dma_map_ops, hence it should implement them as inline
stubs using dma_common_mmap() and dma_common_get_sgtable().
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: linux-m68k@lists.linux-m68k.org
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/m68k/include')
-rw-r--r-- | arch/m68k/include/asm/dma-mapping.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h index 3e6b8445af6a..292805f0762e 100644 --- a/arch/m68k/include/asm/dma-mapping.h +++ b/arch/m68k/include/asm/dma-mapping.h | |||
@@ -115,4 +115,14 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) | |||
115 | #include <asm-generic/dma-mapping-broken.h> | 115 | #include <asm-generic/dma-mapping-broken.h> |
116 | #endif | 116 | #endif |
117 | 117 | ||
118 | /* drivers/base/dma-mapping.c */ | ||
119 | extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, | ||
120 | void *cpu_addr, dma_addr_t dma_addr, size_t size); | ||
121 | extern int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, | ||
122 | void *cpu_addr, dma_addr_t dma_addr, | ||
123 | size_t size); | ||
124 | |||
125 | #define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s) | ||
126 | #define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s) | ||
127 | |||
118 | #endif /* _M68K_DMA_MAPPING_H */ | 128 | #endif /* _M68K_DMA_MAPPING_H */ |