On Thu, Dec 15, 2011 at 05:48:38PM +1100, Michael Ellerman wrote: > On Thu, 2011-12-15 at 17:08 +1100, David Gibson wrote: > > This patch adds code to the code for the powernv platform to create > > and populate isolation groups on hardware using the p7ioc (aka IODA) PCI > > host > > bridge used on some IBM POWER systems. > > > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c > > b/arch/powerpc/platforms/powernv/pci-ioda.c > > index 0cdc8302..6df632e 100644 > > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > > @@ -861,6 +862,9 @@ static void __devinit pnv_ioda_setup_bus_dma(struct > > pnv_ioda_pe *pe, > > set_iommu_table_base(&dev->dev, &pe->tce32_table); > > if (dev->subordinate) > > pnv_ioda_setup_bus_dma(pe, dev->subordinate); > > +#ifdef CONFIG_DEVICE_ISOLATION > > + device_isolation_dev_add(&pe->di_group, &dev->dev); > > +#endif > > You already have a nop version of that in device_isolation.h, so the > ifdef is not required AFAICS.
Alas, this is not true, since the pe->di_group member will not exist
if !CONFIG_DEVICE_ISOLATION. And the stub is an inline, not a macro.
The stubs probably can be fine tuned to avoid ifdefs in more places.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: Digital signature
