From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 196B2A0A02 for ; Mon, 17 May 2021 18:14:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD97A41103; Mon, 17 May 2021 18:14:41 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id EA36F410E2 for ; Mon, 17 May 2021 18:14:40 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lift9-000853-3a; Mon, 17 May 2021 16:14:39 +0000 From: Christian Ehrhardt To: Tyler Retzlaff Cc: David Marchand , dpdk stable Date: Mon, 17 May 2021 18:08:53 +0200 Message-Id: <20210517161039.3132619-104-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: add C++ include guard for reciprocal header' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- >From 8b5417aa2a285b0b6552bb39518e4d74bf12d8c9 Mon Sep 17 00:00:00 2001 From: Tyler Retzlaff 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 Acked-by: David Marchand --- 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 +#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@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