From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH 6/9] m68k: Provide dma_mmap_coherent() and dma_get_sgtable() Date: Sun, 13 Jan 2013 11:44:47 +0100 Message-ID: <1358073890-3610-6-git-send-email-geert@linux-m68k.org> References: <1358073890-3610-1-git-send-email-geert@linux-m68k.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1358073890-3610-1-git-send-email-geert@linux-m68k.org> Sender: linux-m68k-owner@vger.kernel.org To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven , Marek Szyprowski , linux-m68k@lists.linux-m68k.org List-Id: linux-arch.vger.kernel.org m68k/allmodconfig: drivers/media/v4l2-core/videobuf2-dma-contig.c: In function =E2=80=98vb= 2_dc_mmap=E2=80=99: drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit dec= laration of function =E2=80=98dma_mmap_coherent=E2=80=99 drivers/media/v4l2-core/videobuf2-dma-contig.c: In function =E2=80=98vb= 2_dc_get_base_sgt=E2=80=99: drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit dec= laration of function =E2=80=98dma_get_sgtable=E2=80=99 =46or architectures using dma_map_ops, dma_mmap_coherent() and dma_get_sgtable() are provided in . 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 Cc: Marek Szyprowski Cc: linux-m68k@lists.linux-m68k.org --- 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/as= m/dma-mapping.h index c68cdb4..05aa535 100644 --- a/arch/m68k/include/asm/dma-mapping.h +++ b/arch/m68k/include/asm/dma-mapping.h @@ -110,4 +110,14 @@ static inline int dma_mapping_error(struct device = *dev, dma_addr_t handle) return 0; } =20 +/* drivers/base/dma-mapping.c */ +extern int dma_common_mmap(struct device *dev, struct vm_area_struct *= vma, + void *cpu_addr, dma_addr_t dma_addr, size_t size); +extern int dma_common_get_sgtable(struct device *dev, struct sg_table = *sgt, + void *cpu_addr, dma_addr_t dma_addr, + size_t size); + +#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s= ) +#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v,= h, s) + #endif /* _M68K_DMA_MAPPING_H */ --=20 1.7.0.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from juliette.telenet-ops.be ([195.130.137.74]:51236 "EHLO juliette.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754617Ab3AMKpD (ORCPT ); Sun, 13 Jan 2013 05:45:03 -0500 From: Geert Uytterhoeven Subject: [PATCH 6/9] m68k: Provide dma_mmap_coherent() and dma_get_sgtable() Date: Sun, 13 Jan 2013 11:44:47 +0100 Message-ID: <1358073890-3610-6-git-send-email-geert@linux-m68k.org> In-Reply-To: <1358073890-3610-1-git-send-email-geert@linux-m68k.org> References: <1358073890-3610-1-git-send-email-geert@linux-m68k.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven , Marek Szyprowski , linux-m68k@lists.linux-m68k.org Message-ID: <20130113104447.AAfzEgyU4KiHlzegEeOsf65GFa3WCmPjlx-BFhR65Hc@z> 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 . 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 Cc: Marek Szyprowski Cc: linux-m68k@lists.linux-m68k.org --- 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 c68cdb4..05aa535 100644 --- a/arch/m68k/include/asm/dma-mapping.h +++ b/arch/m68k/include/asm/dma-mapping.h @@ -110,4 +110,14 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) return 0; } +/* drivers/base/dma-mapping.c */ +extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, + void *cpu_addr, dma_addr_t dma_addr, size_t size); +extern int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, + void *cpu_addr, dma_addr_t dma_addr, + size_t size); + +#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s) +#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s) + #endif /* _M68K_DMA_MAPPING_H */ -- 1.7.0.4