From patchwork Mon Nov 26 13:41:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 13213 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D897D23EFB for ; Mon, 26 Nov 2012 13:42:29 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3FF6FA19BB5 for ; Mon, 26 Nov 2012 13:42:29 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so4569118ieb.11 for ; Mon, 26 Nov 2012 05:42:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:date:message-id:x-mailer:x-brightmail-tracker:cc:subject :x-beenthere:x-mailman-version:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-gm-message-state; bh=n752lvztCnyAJom9OWbUpXQ5qPQuGn4zJdQCG8LUzqs=; b=KzYgKUPfanX3vaaIbCO4Ga3o62Kx47G7cNvUioHhP0gEl+TuyeS2ZZp8LdbW0lORWm q3tuacLR1EmMVFWAg08lIh19atPK1xraIjnErscnkedlobFz4ovXENTdPt3aF2/9IkC/ P1YVjNYKO1zS6DSoHITXxbfEsd3KWIupuFYV0ny7KOvtvNxeZfrA/5daotX/F4P5tu+W Ib8cXxULQIXhNqIRuw9iUOUEcokOdEpmxGFiUk5kntOcIGMR3TVQYGmijrTMi0QlEHf3 cNS8m2/a6I7cdjU9x1kPpWycXvW5T6DvdX2nKPEV1aKqZMmaE2DVKfXji9qC9lOcise2 FNhQ== Received: by 10.50.152.137 with SMTP id uy9mr10965863igb.62.1353937348567; Mon, 26 Nov 2012 05:42:28 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp261847igt; Mon, 26 Nov 2012 05:42:27 -0800 (PST) Received: by 10.204.128.197 with SMTP id l5mr3532217bks.59.1353937347200; Mon, 26 Nov 2012 05:42:27 -0800 (PST) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id im7si16552326bkc.48.2012.11.26.05.42.25; Mon, 26 Nov 2012 05:42:27 -0800 (PST) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Tcyx4-0000K0-8T; Mon, 26 Nov 2012 13:42:22 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Tcyx3-0000JV-3w for linaro-mm-sig@lists.linaro.org; Mon, 26 Nov 2012 13:42:21 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0ME3005XMKQHC320@mailout3.samsung.com> for linaro-mm-sig@lists.linaro.org; Mon, 26 Nov 2012 22:42:17 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-8b-50b371b99221 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 67.53.01231.9B173B05; Mon, 26 Nov 2012 22:42:17 +0900 (KST) Received: from localhost.localdomain ([106.116.147.30]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0ME300LU3KQ7P550@mmp2.samsung.com> for linaro-mm-sig@lists.linaro.org; Mon, 26 Nov 2012 22:42:17 +0900 (KST) From: Marek Szyprowski To: linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 26 Nov 2012 14:41:48 +0100 Message-id: <1353937308-887-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFJMWRmVeSWpSXmKPExsVy+t9jQd2dhZsDDGZ9UbL4cuUhkwOjx+1/ j5kDGKO4bFJSczLLUov07RK4MqZtfc1ecJK94t2Zq0wNjGvZuhg5OSQETCRady5ghrDFJC7c Ww8U5+IQEpjOKLF0fiNYkZDAKiaJSc9YQWw2AUOJrrddYHERgSKJ5a8PM4E0MAv0MEnceTqf HSQhLBAiMePGJ0YQm0VAVeLJ10NgG3gF3CQeXv0FVMMBtE1BYs4kmwmM3AsYGVYxiqYWJBcU J6XnGuoVJ+YWl+al6yXn525iBPvwmdQOxpUNFocYBTgYlXh4C09sChBiTSwrrsw9xCjBwawk wnvWe3OAEG9KYmVValF+fFFpTmrxIUZpDhYlcd5mj5QAIYH0xJLU7NTUgtQimCwTB6dUA+PR R80bv9/LZA9inKG5zDEwwP5U1LqGgIY5Xw23isSvSohlSL9k6re74fQknoyc9PyX8n3bJA5F sfZJ1hmb3Tpd9S40pD+U7TTH42/myyv8ZBfe2J7An6jb+cjV3yt8NlfE9QW9SvJMazxXd4Tc 67/TauCQvTjfrt03Qv9rEKu3jPuXi0HLlViKMxINtZiLihMBCxdc5N0BAAA= Cc: Stephen Rothwell , Arnd Bergmann , Benjamin Herrenschmidt , Kyungmin Park Subject: [Linaro-mm-sig] [PATCH] dma-mapping: fix dma_common_get_sgtable() conditional compilation X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQnkgL7MYYU0qoyF/8VJsgkO6ahS3kuevfNb1DNptKcgSxGWkXjXyMx5xNk9fz/3gOFRsIHQ 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 --- 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. */