From patchwork Wed Oct 3 19:06:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1543131 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 C05D03FD56 for ; Wed, 3 Oct 2012 19:09:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJUHt-0000uy-3Y; Wed, 03 Oct 2012 19:07:17 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TJUHp-0000uU-L9 for linux-arm-kernel@lists.infradead.org; Wed, 03 Oct 2012 19:07:14 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Lzadu-1TXDlH18aY-014i3z; Wed, 03 Oct 2012 21:06:37 +0200 From: Arnd Bergmann To: Jason Cooper Subject: [PATCH] ARM: mv78xx0: correct addr_map_cfg __initdata annotation Date: Wed, 3 Oct 2012 19:06:34 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201210031906.35123.arnd@arndb.de> X-Provags-ID: V02:K0:fDTer3LnzWYjre++m8jL0desTL3t/7KqVPwvMV0uW7B b7Gaw7+GA+Eurh7bjWcKJW1BmvR38CElxROnCqwEHJ3+1A+MMv yINqrQ+3rOGhZVLdF4GSKpOVqL25b6ZL4LZmVWlRp0btLf66Cl yTiNBhVR201tlO/2cmAL9u0kwA2XN33HT5b15LOLBw1AXluU05 bdSrWzxBCyRD3ieVX62/4zJcNqlmU9yy4sBeoFIU8AeQU4Bfp3 vliP+bTj3K5HNtiy+igF43sjt7Cg3qeRtsATrIW4CUEk+1Aj81 byRDi1pLyf6Fg4mJzlSHt//cW+pzW1KHfFo4aeTgaaLAtjfIGu I89EQEc3JEYy8BNn37Ys= X-Spam-Note: CRM114 invocation failed 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 SPF_HELO_PASS SPF: HELO matches SPF record -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] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 DECEASED_NO_ML Dead not via mailing list Cc: Andrew Lunn , arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The annotation on the addr_map_cfg variable is in the wrong place. Without this patch, building mv78xx0_defconfig results in: /home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: initialization from incompatible pointer type [enabled by default] /home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: (near initialization for 'addr_map_cfg.win_cfg_base') [enabled by default] Signed-off-by: Arnd Bergmann Cc: Jason Cooper Cc: Andrew Lunn Acked-by: Andrew Lunn --- Queued in the late/fixes branch diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c index a9bc841..03f7486 100644 --- a/arch/arm/mach-mv78xx0/addr-map.c +++ b/arch/arm/mach-mv78xx0/addr-map.c @@ -53,7 +53,7 @@ static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, i /* * Description of the windows needed by the platform code */ -static struct __initdata orion_addr_map_cfg addr_map_cfg = { +static struct orion_addr_map_cfg addr_map_cfg __initdata = { .num_wins = 14, .remappable_wins = 8, .win_cfg_base = win_cfg_base,