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 93F5BA0093 for ; Tue, 10 May 2022 14:30:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BE574069D; Tue, 10 May 2022 14:30:52 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 59E1C42832 for ; Tue, 10 May 2022 14:30:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l28igKJrECIXKg9Rm6AUkO75LWGetkIOmVp4adUC81I=; b=AYD2Gc4avkFbHHWLaKg5+Sfn2IOCfViiVX4oAn86836hCgi+JsdM4IrnTa5PTEdb8NZRnO VJ0/nc4tTlcEkodokJUXCALkOWkTgss8BUn2maSk6MaJWDdPhGpTSg7cDnu7act46nygz/ C/ijYGIZg0qt/jpVUDgHzzDeVpgtD34= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-116-pJ0q1yZ9Okeg2aHjkr7vcQ-1; Tue, 10 May 2022 08:30:48 -0400 X-MC-Unique: pJ0q1yZ9Okeg2aHjkr7vcQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84DA08002BF; Tue, 10 May 2022 12:30:48 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E5E040CFD06; Tue, 10 May 2022 12:30:47 +0000 (UTC) From: Kevin Traynor To: Tianhao Chai Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'eal: fix C++ include for device event and DMA' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:58 +0100 Message-Id: <20220510123010.159523-21-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 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 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 Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- 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@dpdk.org