From patchwork Fri Jun 29 05:14:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 167981 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 18FCFB7012 for ; Fri, 29 Jun 2012 15:19:18 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SkTXn-0007ca-Jm; Fri, 29 Jun 2012 05:14:59 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SkTXi-0007cM-JL for linux-arm-kernel@lists.infradead.org; Fri, 29 Jun 2012 05:14:56 +0000 MIME-version: 1.0 Received: from epcpsbgm1.samsung.com (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M6D0052F54R8E80@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 29 Jun 2012 14:14:46 +0900 (KST) X-AuditID: cbfee61a-b7f086d000000e64-5a-4fed39c6069c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id BB.04.03684.6C93DEF4; Fri, 29 Jun 2012 14:14:46 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M6D001U558DHT40@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 29 Jun 2012 14:14:46 +0900 (KST) From: Marek Szyprowski To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH] ARM: dma-mapping: fix build break on no-MMU platform Date: Fri, 29 Jun 2012 07:14:28 +0200 Message-id: <1340946868-18178-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1340614047-5824-3-git-send-email-m.szyprowski@samsung.com> References: <1340614047-5824-3-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBLMWRmVeSWpSXmKPExsVy+t9jAd1jlm/9DZoni1hsenyN1YHRY/OS +gDGKC6blNSczLLUIn27BK6MResesBYc5K7Yv+ICUwPjL84uRk4OCQETib67d9kgbDGJC/fW A9lcHEICixglfiy/CZbgFRCU+DH5HksXIwcHs4C8xJFL2SBhZgF1iUnzFjFD1G9mktjWugqs nk3AUKLrbReYLSLgIfFkxTlmiIYYib/7PrGC2MICrhLfLx8Ds1kEVCWWf4HZ5SGxbtc1ZoiD 5CWe3u8Di3MCxXec/MAIYgsJuEvsarvGMoFRYBaS82YhnDcLyXkLGJlXMYqmFiQXFCel5xrq FSfmFpfmpesl5+duYgSH3zOpHYwrGywOMQpwMCrx8Hrov/UXYk0sK67MPcQowcGsJMKbxAAU 4k1JrKxKLcqPLyrNSS0+xCjNwaIkzttkfcFfSCA9sSQ1OzW1ILUIJsvEwSnVwLiv9GTKvQ37 bz12vP2sPO19yu7Hu7+21K/+nOaf+3nvTIev3VH8Vn/rZygf2xZqdYynXGvvZtb1C1rajPgf bQqYzqV6343XdP+tN3q/giqrfuusvLRnsZCPPlvEco7LG6bsvfyRO+lM1/ri/ZcLIi5nKM9a sbT48PYM2T0nHdpijbm/K8vscUlSYinOSDTUYi4qTgQACHYXTzsCAAA= X-TM-AS-MML: No X-Spam-Note: CRM114 invocation failed X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.24 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kyungmin Park , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org This patch fixes the following build break on no-MMU ARM architectures: arch/arm/mm/dma-mapping.c:576:39: error: macro "__alloc_from_pool" requires 4 arguments, but only 2 given arch/arm/mm/dma-mapping.c: In function ‘__dma_alloc’: arch/arm/mm/dma-mapping.c:576: error: ‘__alloc_from_pool’ undeclared (first use in this function) arch/arm/mm/dma-mapping.c:576: error: (Each undeclared identifier is reported only once arch/arm/mm/dma-mapping.c:576: error: for each function it appears in.) make[1]: *** [arch/arm/mm/dma-mapping.o] Error 1 Reported-by: Paul Gortmaker Signed-off-by: Marek Szyprowski --- arch/arm/mm/dma-mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index c10dab8..c65a180 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -514,7 +514,7 @@ static inline pgprot_t __get_dma_pgprot(struct dma_attrs *attrs, pgprot_t prot) #define __get_dma_pgprot(attrs, prot) __pgprot(0) #define __alloc_remap_buffer(dev, size, gfp, prot, ret, c) NULL -#define __alloc_from_pool(dev, size, ret_page, c) NULL +#define __alloc_from_pool(size, ret_page) NULL #define __alloc_from_contiguous(dev, size, prot, ret) NULL #define __free_from_pool(cpu_addr, size) 0 #define __free_from_contiguous(dev, page, size) do { } while (0)