[dpdk-stable] patch 'mem: fix variable shadowing' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

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/07/19. 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.

Thanks.

Kevin Traynor

---
>From 8e01e6ebbea97ee04f8e940dc6b94e57e75a27ca Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov at intel.com>
Date: Tue, 8 Jan 2019 16:33:59 +0000
Subject: [PATCH] mem: fix variable shadowing

[ upstream commit 199629022c5832f72431570d4f9d615f7a90f2ca ]

A local variable ``flags`` was shadowing another variable from outer
scope. Fix this by renaming the variable and make it const.

Fixes: c127be93f619 ("mem: support using memfd segments for in-memory mode")

Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memalloc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index a93548b8c..10b176d09 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -637,11 +637,11 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
 
 	if (internal_config.in_memory && !memfd_create_supported) {
-		int pagesz_flag, flags;
-
-		pagesz_flag = pagesz_flags(alloc_sz);
-		flags = pagesz_flag | MAP_HUGETLB | MAP_FIXED |
+		const int in_memory_flags = MAP_HUGETLB | MAP_FIXED |
 				MAP_PRIVATE | MAP_ANONYMOUS;
+		int pagesz_flag;
+
+		pagesz_flag = pagesz_flags(alloc_sz);
 		fd = -1;
-		mmap_flags = flags;
+		mmap_flags = in_memory_flags | pagesz_flag;
 
 		/* single-file segments codepath will never be active
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.194210212 +0000
+++ 0019-mem-fix-variable-shadowing.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,13 +1,14 @@
-From 199629022c5832f72431570d4f9d615f7a90f2ca Mon Sep 17 00:00:00 2001
+From 8e01e6ebbea97ee04f8e940dc6b94e57e75a27ca Mon Sep 17 00:00:00 2001
 From: Anatoly Burakov <anatoly.burakov at intel.com>
 Date: Tue, 8 Jan 2019 16:33:59 +0000
 Subject: [PATCH] mem: fix variable shadowing
 
+[ upstream commit 199629022c5832f72431570d4f9d615f7a90f2ca ]
+
 A local variable ``flags`` was shadowing another variable from outer
 scope. Fix this by renaming the variable and make it const.
 
 Fixes: c127be93f619 ("mem: support using memfd segments for in-memory mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
 ---
@@ -15,10 +16,10 @@
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
-index 60a0a680f..5b421f1d7 100644
+index a93548b8c..10b176d09 100644
 --- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
 +++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
-@@ -622,11 +622,11 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
+@@ -637,11 +637,11 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
  
  	if (internal_config.in_memory && !memfd_create_supported) {
 -		int pagesz_flag, flags;