[dpdk-stable] patch 'eal: fix reciprocal header include' has been queued to stable release 19.11.7

Christian Ehrhardt christian.ehrhardt at canonical.com
Thu Feb 4 12:28:51 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/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/a2758e749ca4932a38dfeb4de0058a2f8884ba8c

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From a2758e749ca4932a38dfeb4de0058a2f8884ba8c Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 15 Jan 2021 11:10:33 +0000
Subject: [PATCH] eal: fix reciprocal header include

[ upstream commit 8fc617099ec28e4690e460461f8872ae7b50e86a ]

The rte_reciprocal header file used standard __rte_always_inline from
rte_common.h but does not include that header file, leading to compiler
errors when the reciprocal header is included alone.

Fixes: 6d45659eacb8 ("eal: add u64-bit variant for reciprocal divide")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/common/include/rte_reciprocal.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eal/common/include/rte_reciprocal.h b/lib/librte_eal/common/include/rte_reciprocal.h
index 63e16fde0a..735adb029b 100644
--- a/lib/librte_eal/common/include/rte_reciprocal.h
+++ b/lib/librte_eal/common/include/rte_reciprocal.h
@@ -27,6 +27,8 @@
 
 #include <stdint.h>
 
+#include <rte_common.h>
+
 struct rte_reciprocal {
 	uint32_t m;
 	uint8_t sh1, sh2;
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:31.228676860 +0100
+++ 0076-eal-fix-reciprocal-header-include.patch	2021-02-04 12:04:28.074789772 +0100
@@ -1 +1 @@
-From 8fc617099ec28e4690e460461f8872ae7b50e86a Mon Sep 17 00:00:00 2001
+From a2758e749ca4932a38dfeb4de0058a2f8884ba8c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8fc617099ec28e4690e460461f8872ae7b50e86a ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- lib/librte_eal/include/rte_reciprocal.h | 2 ++
+ lib/librte_eal/common/include/rte_reciprocal.h | 2 ++
@@ -19 +20 @@
-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
@@ -21,2 +22,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