From patchwork Mon Nov 26 20:18:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 1806611 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A092EDF2EB for ; Mon, 26 Nov 2012 20:19:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756043Ab2KZUSs (ORCPT ); Mon, 26 Nov 2012 15:18:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60409 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755969Ab2KZUSr (ORCPT ); Mon, 26 Nov 2012 15:18:47 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAQKIerL002123 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Nov 2012 15:18:41 -0500 Received: from localhost.localdomain (vpn1-5-107.gru2.redhat.com [10.97.5.107]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQKIcU7008224; Mon, 26 Nov 2012 15:18:38 -0500 Date: Mon, 26 Nov 2012 18:18:37 -0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Cc: LMML , LKML , Marek Szyprowski , Stephen Rothwell Subject: Fw: [PATCH] dma-mapping: fix dma_common_get_sgtable() conditional compilation Message-ID: <20121126181837.0596a25a@redhat.com> Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 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 Signed-off-by: Marek Szyprowski Acked-by: Greg Kroah-Hartman --- 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. */