Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S977154AbdDXTSk (ORCPT ); Mon, 24 Apr 2017 15:18:40 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35108 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S972586AbdDXTSc (ORCPT ); Mon, 24 Apr 2017 15:18:32 -0400 MIME-Version: 1.0 In-Reply-To: <20170424085635.GA5289@red-moon> References: <20170424001055.GA1549@roeck-us.net> <20170424085635.GA5289@red-moon> From: Bjorn Helgaas Date: Mon, 24 Apr 2017 14:18:09 -0500 Message-ID: Subject: Re: Build failures in -next due to 'linux/io.h: Add pci_remap_cfgspace() interface' To: Lorenzo Pieralisi Cc: Guenter Roeck , Arnd Bergmann , Will Deacon , Russell King , Catalin Marinas , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v3OJIjSZ022442 Content-Length: 1829 Lines: 56 On Mon, Apr 24, 2017 at 3:56 AM, Lorenzo Pieralisi wrote: > On Sun, Apr 23, 2017 at 05:10:55PM -0700, Guenter Roeck wrote: >> Hi, >> >> -next fails to build for several architectures due to commit 'linux/io.h: Add >> pci_remap_cfgspace() interface'. Error message is >> >> include/linux/io.h: In function ‘pci_remap_cfgspace’: >> include/linux/io.h:108:9: error: implicit declaration of function ‘ioremap_nocache’ >> >> Affected architectures (not necessarily a complete list): >> >> um >> score >> s390 >> >> Bisect results for s390 and score are below. I did not bother to bisect >> the um build; the error message is the same. > > Sorry about that, kbuild did not catch those. Patch below should fix it > (tested it on um/s390); either I do that or I will have to remove the > static inline and make it a: > > #define pci_remap_cfgspace ioremap_nocache > > It is nice to see how consistent the ioremap interface is across arches :) > > Bjorn please let me know how you prefer fixing it, I will post a patch > accordingly. > > Lorenzo > > -- >8 -- > diff --git a/include/linux/io.h b/include/linux/io.h > index 3934aba..2195d9e 100644 > --- a/include/linux/io.h > +++ b/include/linux/io.h > @@ -90,6 +90,7 @@ void *devm_memremap(struct device *dev, resource_size_t offset, > > void *__devm_memremap_pages(struct device *dev, struct resource *res); > > +#ifdef CONFIG_PCI > /* > * The PCI specifications (Rev 3.0, 3.2.5 "Transaction Ordering and > * Posting") mandate non-posted configuration transactions. There is > @@ -108,6 +109,7 @@ static inline void __iomem *pci_remap_cfgspace(phys_addr_t offset, > return ioremap_nocache(offset, size); > } > #endif > +#endif I folded this #ifdef wrapper into the patch and updated my "next" branch. Hopefully that's enough? Bjorn