On Fri, 2015-02-27 at 14:39 +1100, Michael Ellerman wrote: > On Thu, 2015-02-26 at 17:38 +1100, Michael Ellerman wrote: > > On Fri, 2015-20-02 at 08:35:44 UTC, Benjamin Herrenschmidt wrote: > > > diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c > > > index e24e0ae..6306d4e 100644 > > > --- a/arch/powerpc/kernel/dma.c > > > +++ b/arch/powerpc/kernel/dma.c > > > @@ -63,16 +63,8 @@ void *dma_direct_alloc_coherent(struct device *dev, > > > size_t size, > > > return NULL; > > > } > > > > > > - switch (zone) { > > > - case ZONE_DMA: > > > - flag |= GFP_DMA; > > > - break; > > > -#ifdef CONFIG_ZONE_DMA32 > > > - case ZONE_DMA32: > > > + if (zone == ZONE_DMA32) > > > flag |= GFP_DMA32; > > > - break; > > > -#endif > > > - }; > > > > You still need the ifdef, else eg. ppc6xx_defconfig: > > > > arch/powerpc/kernel/dma.c:66:14: error: 'ZONE_DMA32' undeclared (first > > use in this function) > > And the rest :) > > http://kisskb.ellerman.id.au/kisskb/head/8505/ > > Successful: 45% 49/109
Yup, I forgot I didn't have it unconditionally on ppc32 :-) I'll respin some time next week. Cheers, Ben. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev