[dpdk-stable] patch 'bus/dpaa: fix build' has been queued to stable release 18.05.1
Christian Ehrhardt
christian.ehrhardt at canonical.com
Mon Jul 30 18:11:16 CEST 2018
Hi,
FYI, your patch has been queued to stable release 18.05.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/01/18. So please
shout if anyone has objections.
Thanks.
Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
>From da8a90991927cf183d66930e0d649e59e6ab59fd Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Wed, 20 Jun 2018 12:38:06 +0200
Subject: [PATCH] bus/dpaa: fix build
[ upstream commit ce819b84220ef4abe87cccc71c78e7f4bc7a2f8b ]
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")
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Shreyansh Jain <shreyansh.jain at nxp.com>
---
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
More information about the stable
mailing list