Fw: [PATCH] dma-mapping: fix dma_common_get_sgtable() conditionalcompilation

[Mauro Carvalho Chehab]

Hi Greg,

Are you maintaining drivers/base/dma-mapping.c? The enclosed path is needed to
enable DMABUF handling on V4L2 on some architectures, like x86_64, as we need
dma_common_get_sgtable() on drivers/media/v4l2-core/videobuf2-dma-contig.c.

Would you mind acking it, in order to let this patch flow via my tree? This way,
I can revert a workaround I had to apply there, in order to avoid linux-next
compilation breakage.

Thanks!
Mauro

-

From: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Date: Mon, 26 Nov 2012 14:41:48 +0100

dma_common_get_sgtable() function doesn't depend on
ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY, so it must not be compiled
conditionally.

Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
---
 drivers/base/dma-mapping.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 3fbedc7..0ce39a3 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -218,6 +218,8 @@ void dmam_release_declared_memory(struct device *dev)
 }
 EXPORT_SYMBOL(dmam_release_declared_memory);
 
+#endif
+
 /*
  * Create scatter-list for the already allocated DMA buffer.
  */
@@ -236,8 +238,6 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
 }
 EXPORT_SYMBOL(dma_common_get_sgtable);
 
-#endif
-
 /*
  * Create userspace mapping for the DMA-coherent memory.
  */
-- 
1.7.9.5



-- 
Regards,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/