patch 'eal: fix C++ include for device event and DMA' has been queued to stable release 21.11.2

Kevin Traynor ktraynor at redhat.com
Tue May 10 14:29:58 CEST 2022


Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/15/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/f343d3b4ed76c826928cde54e8818680859cf50d

Thanks.

Kevin

---
>From f343d3b4ed76c826928cde54e8818680859cf50d Mon Sep 17 00:00:00 2001
From: Tianhao Chai <cth451 at gmail.com>
Date: Wed, 4 May 2022 23:39:35 -0500
Subject: [PATCH] eal: fix C++ include for device event and DMA

[ upstream commit 28c5d600723a9bb384a4b2f79bf6af8c40950bba ]

Currently the "extern C" section ends right before rte_dev_dma_unmap
and other DMA function declarations, causing some C++ compilers to
produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols.
This leads to build failures later when linking a final executable
against this object.

Fixes: a753e53d517b ("eal: add device event monitor framework")

Signed-off-by: Tianhao Chai <cth451 at gmail.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
---
 lib/eal/include/rte_dev.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index 448a41cb0e..e6ff1218f9 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -321,8 +321,4 @@ rte_dev_iterator_next(struct rte_dev_iterator *it);
 	     dev = rte_dev_iterator_next(it))
 
-#ifdef __cplusplus
-}
-#endif
-
 /**
  * @warning
@@ -497,3 +493,7 @@ rte_dev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova,
 		  size_t len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_DEV_H_ */
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-10 13:24:22.169362865 +0100
+++ 0021-eal-fix-C-include-for-device-event-and-DMA.patch	2022-05-10 13:24:21.612646371 +0100
@@ -1 +1 @@
-From 28c5d600723a9bb384a4b2f79bf6af8c40950bba Mon Sep 17 00:00:00 2001
+From f343d3b4ed76c826928cde54e8818680859cf50d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 28c5d600723a9bb384a4b2f79bf6af8c40950bba ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list