From patchwork Tue Feb 5 15:02:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 2098041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0824C3FDF1 for ; Tue, 5 Feb 2013 15:05:48 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2k2k-0004gs-90; Tue, 05 Feb 2013 15:02:42 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U2k2g-0004ga-Uf for linux-arm-kernel@lists.infradead.org; Tue, 05 Feb 2013 15:02:39 +0000 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0M8FxW-1UpsO10eTi-00vxmy; Tue, 05 Feb 2013 16:02:27 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 353642A28205; Tue, 5 Feb 2013 16:02:26 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kzORng8NZOPe; Tue, 5 Feb 2013 16:02:25 +0100 (CET) Received: from mailman.adnet.avionic-design.de (mailman.adnet.avionic-design.de [172.20.31.172]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 47EC92A280B7; Tue, 5 Feb 2013 16:02:25 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) by mailman.adnet.avionic-design.de (Postfix) with ESMTP id 7D380100481; Tue, 5 Feb 2013 16:02:21 +0100 (CET) From: Thierry Reding To: Russell King Subject: [PATCH] ARM: dma-mapping: Fix non-MMU builds Date: Tue, 5 Feb 2013 16:02:25 +0100 Message-Id: <1360076545-1943-1-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.1.2 X-Provags-ID: V02:K0:XY91g/2Bt15DD4jv9lLtwOg3OtEyPVm2tyrkYEr8sWl N9UCqyKjBXMxpg2iLHmQ1lglHs+Od7+VzknwDWpt/x9ppF9S8a 1UaxeocC0Fdk2dKnIOLOAguMXZNRwKdNwrRFfVlYCeqZju1lDn aCUrYIKp0FfvEkTSljo2dUTFkvm8dBWgJdH35zTNhHF4b1AoWm h/oCaHet+TQZsbEdO9ka9mDpYkEZUR0K5I2zQLuvvX0jVF1sLL jzlVCalrSJoBnBbzixyXixPGq9CTnXvbYG4Bm0vEEbz1Wu0Ex1 3CcLGOgeOh7KqTzPjCgsOU82q8Q0AayCflkuUEKqdOqjdtyJ4c f/EhBdoOfWqu1/tbLsxsyiKMrQRW3SgPbSrXs83yQUs40vjKtG EJJvLUbxJebWLyu0xylVrsdEgN/GNVBf1RTSOYGSBOymNlZAKc i14H8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130205_100239_203179_4CF3FE5A X-CRM114-Status: UNSURE ( 9.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit 8cdf82d (ARM: dma-mapping: add support for CMA regions placed in highmem zone) changed the signature of the__alloc_from_contiguous() and __free_from_contiguous() functions but forgot to update the dummy macro equivalents for non-MMU. Signed-off-by: Thierry Reding --- arch/arm/mm/dma-mapping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index a064e9d..2163af4 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -610,9 +610,9 @@ 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(size, ret_page) NULL -#define __alloc_from_contiguous(dev, size, prot, ret) NULL +#define __alloc_from_contiguous(dev, size, prot, ret, c) NULL #define __free_from_pool(cpu_addr, size) 0 -#define __free_from_contiguous(dev, page, size) do { } while (0) +#define __free_from_contiguous(dev, page, cpu_addr, size) do { } while (0) #define __dma_free_remap(cpu_addr, size) do { } while (0) #endif /* CONFIG_MMU */