[PATCH 2/2] powerpc: Fix build without CONFIG_PCI

Benjamin Herrenschmidt benh at kernel.crashing.org
Fri Aug 5 20:16:41 EST 2011


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 at 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);




More information about the Linuxppc-dev mailing list