[dpdk-stable] [dpdk-dev] [PATCH] bus/dpaa: fix build

[Thomas Monjalon]

21/06/2018 09:58, Shreyansh Jain:
> On Wednesday 20 June 2018 07:39 PM, Thomas Monjalon wrote:
> > The DPAA bus driver is defining some macros without prefix.
> > So it can conflict with other libraries like libbsd:
> > 
> > 	drivers/bus/dpaa/include/compat.h:53:
> > 		error: "__packed" redefined
> > 	/usr/include/bsd/sys/cdefs.h:120:
> > 		note: this is the location of the previous definition
> > 
> > Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
> > Cc: stable at dpdk.org
> > Cc: geoff.thorpe at nxp.com
> > Cc: hemant.agrawal at nxp.com
> > Cc: shreyansh.jain at nxp.com
> > 
> > Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
> > ---
> >   drivers/bus/dpaa/include/compat.h | 6 ++++++
> >   1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h
> > index e4b570214..92241d231 100644
> > --- a/drivers/bus/dpaa/include/compat.h
> > +++ b/drivers/bus/dpaa/include/compat.h
> > @@ -48,9 +48,15 @@
> >    */
> >   
> >   /* Required compiler attributes */
> > +#ifndef __maybe_unused
> >   #define __maybe_unused	__rte_unused
> > +#endif
> > +#ifndef __always_unused
> >   #define __always_unused	__rte_unused
> > +#endif
> > +#ifndef __packed
> >   #define __packed	__rte_packed
> > +#endif
> >   #define noinline	__attribute__((noinline))
> >   
> >   #define L1_CACHE_BYTES 64
> > 
> 
> A similar patch was also issued by Jerin a few weeks back:
> http://patches.dpdk.org/patch/40597/

I missed it.

> There may be conflict while merging.
> 
> Whether you take that, or this (preferred):
> 
> Acked-by: Shreyansh Jain <shreyansh.jain at nxp.com>

This one is more complete.
Applied