| Message ID | 1312524247.8598.25.camel@pasglop (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 81210c2062cf98bf625bcd487334c89b0fce5a82 |
| Headers | show |
Hi Ben, On Fri, 05 Aug 2011 16:04:07 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > > Commit fea80311a939a746533a6d7e7c3183729d6a3faf > "iomap: make IOPORT/PCI mapping functions conditional" > > Broke powerpc build without CONFIG_PCI as we would still define > pci_iomap(), which overlaps with the new empty inline in the headers. If we are using a static inline implementation for !CONFIG_PCI, then we should probably not EXPORT it in that case either ... > @@ -143,6 +144,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr) > return; > iounmap(addr); > } > +#endif /* CONFIG_PCI */ > > EXPORT_SYMBOL(pci_iomap); > EXPORT_SYMBOL(pci_iounmap);
On Fri, 2011-08-05 at 17:37 +1000, Stephen Rothwell wrote: > Hi Ben, > > On Fri, 05 Aug 2011 16:04:07 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > > > > Commit fea80311a939a746533a6d7e7c3183729d6a3faf > > "iomap: make IOPORT/PCI mapping functions conditional" > > > > Broke powerpc build without CONFIG_PCI as we would still define > > pci_iomap(), which overlaps with the new empty inline in the headers. > > If we are using a static inline implementation for !CONFIG_PCI, then we > should probably not EXPORT it in that case either ... Good point, interesting that my build test didn't catch it ... I'll add another patch on top before I ask Linus to pull. Cheers, Ben. > > @@ -143,6 +144,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr) > > return; > > iounmap(addr); > > } > > +#endif /* CONFIG_PCI */ > > > > EXPORT_SYMBOL(pci_iomap); > > EXPORT_SYMBOL(pci_iounmap);
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c index 1577434..faca64a 100644 --- a/arch/powerpc/kernel/iomap.c +++ b/arch/powerpc/kernel/iomap.c @@ -117,6 +117,7 @@ void ioport_unmap(void __iomem *addr) EXPORT_SYMBOL(ioport_map); EXPORT_SYMBOL(ioport_unmap); +#ifdef CONFIG_PCI void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max) { resource_size_t start = pci_resource_start(dev, bar); @@ -143,6 +144,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr) return; iounmap(addr); } +#endif /* CONFIG_PCI */ EXPORT_SYMBOL(pci_iomap); EXPORT_SYMBOL(pci_iounmap);
Commit fea80311a939a746533a6d7e7c3183729d6a3faf "iomap: make IOPORT/PCI mapping functions conditional" Broke powerpc build without CONFIG_PCI as we would still define pci_iomap(), which overlaps with the new empty inline in the headers. Make our implementation conditional on CONFIG_PCI Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/kernel/iomap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)