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: 9692 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 EE8DF23E41 for ; Fri, 29 Jun 2012 05:15:02 +0000 (UTC) Received: from mail-ob0-f180.google.com (mail-ob0-f180.google.com [209.85.214.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8BF13A1816D for ; Fri, 29 Jun 2012 05:15:02 +0000 (UTC) Received: by obbuo19 with SMTP id uo19so4567172obb.11 for ; Thu, 28 Jun 2012 22:15:02 -0700 (PDT) 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:date:from :in-reply-to:to:message-id:mime-version:x-mailer:x-auditid :x-brightmail-tracker:x-tm-as-mml:references:cc:subject:x-beenthere :x-mailman-version:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-gm-message-state; bh=HwNfuwur5pVTkEMtK/GkcrWiv5adHdt10v/CuESGJpE=; b=I3IjD6cy083mgTSnLUL9u09jEO63455vN+RjNArnzJO4zt58NenMuQxf7j7OVvpyUU foGNEGLKL2134yyc2SfI1z4tEGFOm0lRobbNK9LMbiCeLKWw87e9lnu1V2Ck9Y3bQfrr 0JkzGeEnUxvj2q2FeXx2DlYUcRAK8DG65BEYKi6ChNODv3aSpsggUC9L6gn4DV1ECZAr xmFI20dbrlp7UjXFJEt8kvz9NADzuy1TQomIXFyhoCT0dt+Owab8B6T3i19GSJ3CbYdE k3+GAmCh3UCcj4sJlrV7v7SCph5V1k4CKs9AKTLBRTMZXS7NiMvisyKyTkhcElVTymqG lHTA== Received: by 10.50.195.234 with SMTP id ih10mr141721igc.0.1340946901680; Thu, 28 Jun 2012 22:15:01 -0700 (PDT) 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.231.24.148 with SMTP id v20csp73939ibb; Thu, 28 Jun 2012 22:15:00 -0700 (PDT) Received: by 10.204.152.137 with SMTP id g9mr57015bkw.95.1340946899574; Thu, 28 Jun 2012 22:14:59 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id hg14si1174837bkc.4.2012.06.28.22.14.57; Thu, 28 Jun 2012 22:14:59 -0700 (PDT) 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 1SkTXh-00048R-6j; Fri, 29 Jun 2012 05:14:53 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SkTXg-00046W-0a for linaro-mm-sig@lists.linaro.org; Fri, 29 Jun 2012 05:14:52 +0000 Received: from epcpsbgm2.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M6D00EDA55GQGM0@mailout2.samsung.com> for linaro-mm-sig@lists.linaro.org; Fri, 29 Jun 2012 14:14:46 +0900 (KST) Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id D1.16.12095.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 linaro-mm-sig@lists.linaro.org; Fri, 29 Jun 2012 14:14:46 +0900 (KST) Date: Fri, 29 Jun 2012 07:14:28 +0200 From: Marek Szyprowski In-reply-to: <1340614047-5824-3-git-send-email-m.szyprowski@samsung.com> To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org Message-id: <1340946868-18178-1-git-send-email-m.szyprowski@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.10 X-AuditID: cbfee61b-b7f776d000002f3f-32-4fed39c6406c X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBLMWRmVeSWpSXmKPExsVy+t9jAd1jlm/9DZZ2iVh8ufKQyYHR4/a/ x8wBjFFcNimpOZllqUX6dglcGYvWPWAtOMhdsX/FBaYGxl+cXYycHBICJhL/9h1kgrDFJC7c W8/WxcjFISSwiFFi4cG5zCAJXgFBiR+T77F0MXJwMAvISxy5lA0SZhZQl5g0bxFYiZDAWiaJ rwvlQGw2AUOJrrddbCC2iICHxJMV55gh6mMk/u77xApiCwu4Sny/fAzMZhFQlVj+5SYbxCoP iXW7rjFD3CMv8fR+H1icEyi+4+QHRohd7hK72q6xTGAUmIXkulkI181Cct0CRuZVjKKpBckF xUnpuUZ6xYm5xaV56XrJ+bmbGMHh90x6B+OqBotDjAIcjEo8vC9U3/oLsSaWFVfmHmKU4GBW EuFNYgAK8aYkVlalFuXHF5XmpBYfYpTmYFES522yvuAvJJCeWJKanZpakFoEk2Xi4JRqYDS/ EeBxxZV35cOj144VCJvkZvjcOx9zLHv+xZRl0fpPNyxhvC21fO7l76ERqz/cOJH3YeayrD36 pfcnbjDK5TOYkOavIxtzMuj3ZtnCxFcnrHSYP252Yf9+ObSv9kZ0TK4c957A+VX3cw6LXhKS PcHhvfF09X7pX5e+9fWcvbP6su1tj46XSbxKLMUZiYZazEXFiQDyArxlOwIAAA== X-TM-AS-MML: No References: <1340614047-5824-3-git-send-email-m.szyprowski@samsung.com> Cc: Kyungmin Park Subject: [Linaro-mm-sig] [PATCH] ARM: dma-mapping: fix build break on no-MMU platform 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: , Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQmSJQHrxauuwyLK6ju2EaORS023D/URNmVMgwdZQUz1WzL/44GHpfYUYRjM07tGwpfGugfj 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)