[dpdk-stable] patch 'eal: add C++ include guard for reciprocal header' has been queued to stable release 19.11.9

Christian Ehrhardt christian.ehrhardt at canonical.com
Mon May 17 18:08:53 CEST 2021


Hi,

FYI, your patch has been queued to stable release 19.11.9

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/19/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/8b5417aa2a285b0b6552bb39518e4d74bf12d8c9

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 8b5417aa2a285b0b6552bb39518e4d74bf12d8c9 Mon Sep 17 00:00:00 2001
From: Tyler Retzlaff <roretzla at linux.microsoft.com>
Date: Wed, 17 Mar 2021 09:14:12 -0700
Subject: [PATCH] eal: add C++ include guard for reciprocal header

[ upstream commit a6f88f7eb9ed077a02607cf9cd2b5101eda9f804 ]

Add missing extern "C" linkage for rte_reciprocal.h consistent with
other eal headers.

Fixes: ffe3ec811ef5 ("sched: introduce reciprocal divide")

Signed-off-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/common/include/rte_reciprocal.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/librte_eal/common/include/rte_reciprocal.h b/lib/librte_eal/common/include/rte_reciprocal.h
index 735adb029b..fa1cb4854e 100644
--- a/lib/librte_eal/common/include/rte_reciprocal.h
+++ b/lib/librte_eal/common/include/rte_reciprocal.h
@@ -29,6 +29,10 @@
 
 #include <rte_common.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct rte_reciprocal {
 	uint32_t m;
 	uint8_t sh1, sh2;
@@ -89,4 +93,8 @@ rte_reciprocal_divide_u64(uint64_t a, const struct rte_reciprocal_u64 *R)
 struct rte_reciprocal rte_reciprocal_value(uint32_t d);
 struct rte_reciprocal_u64 rte_reciprocal_value_u64(uint64_t d);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_RECIPROCAL_H_ */
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:33.526112262 +0200
+++ 0104-eal-add-C-include-guard-for-reciprocal-header.patch	2021-05-17 17:40:29.307810548 +0200
@@ -1 +1 @@
-From a6f88f7eb9ed077a02607cf9cd2b5101eda9f804 Mon Sep 17 00:00:00 2001
+From 8b5417aa2a285b0b6552bb39518e4d74bf12d8c9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a6f88f7eb9ed077a02607cf9cd2b5101eda9f804 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15 +16 @@
- lib/librte_eal/include/rte_reciprocal.h | 8 ++++++++
+ lib/librte_eal/common/include/rte_reciprocal.h | 8 ++++++++
@@ -18 +19 @@
-diff --git a/lib/librte_eal/include/rte_reciprocal.h b/lib/librte_eal/include/rte_reciprocal.h
+diff --git a/lib/librte_eal/common/include/rte_reciprocal.h b/lib/librte_eal/common/include/rte_reciprocal.h
@@ -20,2 +21,2 @@
---- a/lib/librte_eal/include/rte_reciprocal.h
-+++ b/lib/librte_eal/include/rte_reciprocal.h
+--- a/lib/librte_eal/common/include/rte_reciprocal.h
++++ b/lib/librte_eal/common/include/rte_reciprocal.h


More information about the stable mailing list