From patchwork Thu May 2 17:23:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2513571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 1F18DDF215 for ; Thu, 2 May 2013 19:29:50 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXxGl-0003Wr-NM; Thu, 02 May 2013 17:26:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXxEU-0005ph-CR; Thu, 02 May 2013 17:23:50 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXxED-0005m0-GZ for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 17:23:34 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LiJxI-1U1vmw3IxI-00ceoT; Thu, 02 May 2013 19:23:07 +0200 From: Arnd Bergmann To: Russell King Subject: [PATCH 3/4] ARM: fix NOMMU __arm_ioremap prototype Date: Thu, 2 May 2013 19:23:23 +0200 Message-Id: <1367515404-512212-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1367515404-512212-1-git-send-email-arnd@arndb.de> References: <1367515404-512212-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:5Zdhp/PhsDuRosRowxSd4mqOZMaSpOpSWnBZIYSt1tz 4aYQu/rzOhqD8wGwi2p7oIVwoLEPgdvVYaMlRhJTgjxgNeCKYN WBwtvz1BfdquKeWh3tJruuJT9zeZfxG3PIl7K2cjtca0IJ+v55 T9UHBgBhogZOHaaA50FmjMKrl12fQYC5s2G2NBl1ibfcvof2yu us9wTgeXtzQqK6bfj/rNU7Q3Fahm/X2Ghu6vQ2w0fhteB/a1Bo VvjRyg7IjkTNCGfg32oMhTa4Oq5E/o7Kl5yGy4PsgbvNr8uXOw qC1K+E1Z08e6j7ulBK6bUggAQXQ4+GQkQFydGSo5TY87RlsTH4 XucH3lLgyUts7owN5jJAIK1cds78xclxSE0fWauLr X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_132333_806531_2B787C04 X-CRM114-Status: UNSURE ( 9.47 ) 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.187 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: Russell King , Laura Abbott , Arnd Bergmann , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The declaration of __arm_ioremap has changed to take a phys_addr_t as the first argument, while the definition for nommu has not changed. This adds the obvious change. Cc: Laura Abbott Cc: Russell King Signed-off-by: Arnd Bergmann --- arch/arm/mm/nommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index e9f2e44..98303d9 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -88,7 +88,7 @@ void __iomem *__arm_ioremap_pfn_caller(unsigned long pfn, unsigned long offset, return __arm_ioremap_pfn(pfn, offset, size, mtype); } -void __iomem *__arm_ioremap(unsigned long phys_addr, size_t size, +void __iomem *__arm_ioremap(phys_addr_t phys_addr, size_t size, unsigned int mtype) { return (void __iomem *)phys_addr;