From patchwork Thu Jul 19 14:16:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1217001 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 B9C363FD48 for ; Thu, 19 Jul 2012 14:26: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 1SrrY4-0000zl-Re; Thu, 19 Jul 2012 14:17:49 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SrrXP-0000vk-1Q for linux-arm-kernel@lists.infradead.org; Thu, 19 Jul 2012 14:17:07 +0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LfcGk-1TcloW3eg6-00pK16; Thu, 19 Jul 2012 16:16:35 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [GIT PULL] io.h clean-up for PCI Date: Thu, 19 Jul 2012 14:16:32 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0-rc1+; KDE/4.3.2; x86_64; ; ) References: <50049285.1060100@gmail.com> In-Reply-To: <50049285.1060100@gmail.com> MIME-Version: 1.0 Message-Id: <201207191416.33330.arnd@arndb.de> X-Provags-ID: V02:K0:G1kR6G6Pjk7icI32fbkNnRgcLp64gTbhIkLKa5HdvoY GMmlqRfpJtUXAw88Kks21hn8DvVtRZd0KhhojZilkaMPzcsVtu aHmnXWkA4awChWzNmYh7hmishsbalXywMcyqcqUk6ng5eknP/Y Z6esL3qLo+XSlaGa41x8zcT+k8OGoZDO9SbOPAqc8BYU2WpFM/ n8GozsnnWSXPu/giOsRKWA+UHksPgI2RVVkyTBR6def9qHzEqc 7D2bv/058jFynWMBpd+v1tvMPOy0tip8VS+9lriHWDpgFa83kN hc1DafuqIdmt0ApLXnj4/dBv91dL8aWclSYE/V97kN/ZB4CKTV 5hnWsLXOgLyvQlfJvF00= 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 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: Olof Johansson , Nicolas Pitre 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 On Monday 16 July 2012, Rob Herring wrote: > Arnd, > > Please pull io.h PCI clean-up series. As you suggested, lets get it in > next for test and decide later if to apply it for 3.6 or wait. > > BTW, I'll have sporadic email access over the next 2 weeks. I've alrady applied this patch on top, which was rather obvious. Arnd commit 960760557356fba9e86698605d1e1c68783d72e3 Author: Arnd Bergmann Date: Thu Jul 19 16:13:41 2012 +0200 ARM: pci: mark pci_reserve_io as __init pci_reserve_io calls the vm_reserve_area_early function that is marked __init, so it needs to be __init itself to avoid this warning: WARNING: arch/arm/mm/built-in.o(.text+0x22dc): Section mismatch in reference from the function pci_reserve_io() to the function .init.text:vm_reserve_area_early() Signed-off-by: Arnd Bergmann diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 6345a5f..188fd58 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -64,7 +64,7 @@ void pci_common_init(struct hw_pci *); */ #if defined(CONFIG_PCI) && !defined(CONFIG_NEED_MACH_IO_H) /* Called from devicemaps_init before .map_io */ -static inline void pci_reserve_io(void) +static inline void __init pci_reserve_io(void) { vm_reserve_area_early(PCI_IO_VIRT_BASE, SZ_2M, pci_reserve_io); }