* [dpdk-stable] [PATCH] bus/dpaa: fix build
@ 2018-06-20 14:09 Thomas Monjalon
2018-06-21 7:58 ` [dpdk-stable] [dpdk-dev] " Shreyansh Jain
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Monjalon @ 2018-06-20 14:09 UTC (permalink / raw)
To: dev; +Cc: stable, geoff.thorpe, hemant.agrawal, shreyansh.jain
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@dpdk.org
Cc: geoff.thorpe@nxp.com
Cc: hemant.agrawal@nxp.com
Cc: shreyansh.jain@nxp.com
Signed-off-by: Thomas Monjalon <thomas@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
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH] bus/dpaa: fix build
2018-06-20 14:09 [dpdk-stable] [PATCH] bus/dpaa: fix build Thomas Monjalon
@ 2018-06-21 7:58 ` Shreyansh Jain
2018-06-21 8:28 ` Thomas Monjalon
0 siblings, 1 reply; 3+ messages in thread
From: Shreyansh Jain @ 2018-06-21 7:58 UTC (permalink / raw)
To: Thomas Monjalon
Cc: dev, stable, geoff.thorpe, hemant.agrawal, shreyansh.jain, Jerin Jacob
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@dpdk.org
> Cc: geoff.thorpe@nxp.com
> Cc: hemant.agrawal@nxp.com
> Cc: shreyansh.jain@nxp.com
>
> Signed-off-by: Thomas Monjalon <thomas@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/
There may be conflict while merging.
Whether you take that, or this (preferred):
Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH] bus/dpaa: fix build
2018-06-21 7:58 ` [dpdk-stable] [dpdk-dev] " Shreyansh Jain
@ 2018-06-21 8:28 ` Thomas Monjalon
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2018-06-21 8:28 UTC (permalink / raw)
To: dev; +Cc: Shreyansh Jain, stable, hemant.agrawal, Jerin Jacob
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@dpdk.org
> > Cc: geoff.thorpe@nxp.com
> > Cc: hemant.agrawal@nxp.com
> > Cc: shreyansh.jain@nxp.com
> >
> > Signed-off-by: Thomas Monjalon <thomas@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@nxp.com>
This one is more complete.
Applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-21 8:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-20 14:09 [dpdk-stable] [PATCH] bus/dpaa: fix build Thomas Monjalon
2018-06-21 7:58 ` [dpdk-stable] [dpdk-dev] " Shreyansh Jain
2018-06-21 8:28 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).