patch 'malloc: remove return from void functions' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Mon Dec 11 11:10:27 CET 2023


Hi,

FYI, your patch has been queued to stable release 22.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4f5e8c612ff6243923a51e2d6c93bc7cf6829b10

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 4f5e8c612ff6243923a51e2d6c93bc7cf6829b10 Mon Sep 17 00:00:00 2001
From: Tyler Retzlaff <roretzla at linux.microsoft.com>
Date: Tue, 17 Oct 2023 06:03:39 -0700
Subject: [PATCH] malloc: remove return from void functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ]

Remove return from rte_free and eal_free_no_trace both functions are
declared to have a return type of void so they shouldn't return a value.

Fixes: 52f409d614a0 ("trace: add memory tracepoints")

Signed-off-by: Tyler Retzlaff <roretzla at linux.microsoft.com>
Reviewed-by: Morten Brørup <mb at smartsharesystems.com>
---
 lib/eal/common/rte_malloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 48db264449..dbd8eae5b0 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -41,13 +41,13 @@ mem_free(void *addr, const bool trace_ena)
 void
 rte_free(void *addr)
 {
-	return mem_free(addr, true);
+	mem_free(addr, true);
 }
 
 void
 eal_free_no_trace(void *addr)
 {
-	return mem_free(addr, false);
+	mem_free(addr, false);
 }
 
 static void *
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:23.336031200 +0800
+++ 0002-malloc-remove-return-from-void-functions.patch	2023-12-11 17:56:22.877652300 +0800
@@ -1 +1 @@
-From 732ba1be28f75c87aa2616660d34ed0a278c7ae6 Mon Sep 17 00:00:00 2001
+From 4f5e8c612ff6243923a51e2d6c93bc7cf6829b10 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index ebafef3f6c..9db0c399ae 100644
+index 48db264449..dbd8eae5b0 100644


More information about the stable mailing list