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

Xueming Li xuemingl at nvidia.com
Mon May 10 18:02:00 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.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/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/9e520a5a7aad047b8d3bc479cbf0e88a3184dcd2

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 9e520a5a7aad047b8d3bc479cbf0e88a3184dcd2 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
Cc: Luca Boccassi <bluca at debian.org>

[ 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/include/rte_reciprocal.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/librte_eal/include/rte_reciprocal.h b/lib/librte_eal/include/rte_reciprocal.h
index 735adb029b..fa1cb4854e 100644
--- a/lib/librte_eal/include/rte_reciprocal.h
+++ b/lib/librte_eal/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.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:31.024535500 +0800
+++ 0172-eal-add-C-include-guard-for-reciprocal-header.patch	2021-05-10 23:59:26.610000000 +0800
@@ -1 +1 @@
-From a6f88f7eb9ed077a02607cf9cd2b5101eda9f804 Mon Sep 17 00:00:00 2001
+From 9e520a5a7aad047b8d3bc479cbf0e88a3184dcd2 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit a6f88f7eb9ed077a02607cf9cd2b5101eda9f804 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list