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

Kevin Traynor ktraynor at redhat.com
Thu Nov 2 14:12:50 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.11.6

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/7a268dfe93b27babb992f5c5e776d105dbe0d945

Thanks.

Kevin

---
>From 7a268dfe93b27babb992f5c5e776d105dbe0d945 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

[ 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 d0bec26920..c5a7757deb 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -47,5 +47,5 @@ void
 rte_free(void *addr)
 {
-	return mem_free(addr, true);
+	mem_free(addr, true);
 }
 
@@ -53,5 +53,5 @@ void
 eal_free_no_trace(void *addr)
 {
-	return mem_free(addr, false);
+	mem_free(addr, false);
 }
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.278223314 +0000
+++ 0104-malloc-remove-return-from-void-functions.patch	2023-11-02 13:09:40.926163698 +0000
@@ -1 +1 @@
-From 732ba1be28f75c87aa2616660d34ed0a278c7ae6 Mon Sep 17 00:00:00 2001
+From 7a268dfe93b27babb992f5c5e776d105dbe0d945 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index ebafef3f6c..9db0c399ae 100644
+index d0bec26920..c5a7757deb 100644
@@ -25 +26 @@
-@@ -42,5 +42,5 @@ void
+@@ -47,5 +47,5 @@ void
@@ -32 +33 @@
-@@ -48,5 +48,5 @@ void
+@@ -53,5 +53,5 @@ void



More information about the stable mailing list