[dpdk-stable] patch 'spinlock/x86: move stack declaration before code' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/04/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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 4a87afb90a3197866ad0676029c999ac26e95030 Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Sat, 12 May 2018 09:59:17 +0800
Subject: [PATCH] spinlock/x86: move stack declaration before code

[ upstream commit f7f18e92a51276f1e23a0595f59615f79323b358 ]

In function 'rte_try_tm':
rte_spinlock.h:82:2:
warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement]
  int retries = RTE_RTM_MAX_RETRIES;

Fixes: ba7468997ea6 ("spinlock: add HTM lock elision for x86")

Signed-off-by: Andy Green <andy at warmcat.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/librte_eal/common/include/arch/x86/rte_spinlock.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h
index 5675c2b45..10cd7a30c 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h
@@ -105,10 +105,12 @@ static inline int rte_tm_supported(void)
 static inline int
 rte_try_tm(volatile int *lock)
 {
+	int retries;
+
 	if (!rte_rtm_supported)
 		return 0;
 
-	int retries = RTE_RTM_MAX_RETRIES;
+	retries = RTE_RTM_MAX_RETRIES;
 
 	while (likely(retries--)) {
 
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.316305572 -0800
+++ 0004-spinlock-x86-move-stack-declaration-before-code.patch	2019-01-02 23:59:12.006815000 -0800
@@ -1,8 +1,10 @@
-From f7f18e92a51276f1e23a0595f59615f79323b358 Mon Sep 17 00:00:00 2001
+From 4a87afb90a3197866ad0676029c999ac26e95030 Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Sat, 12 May 2018 09:59:17 +0800
 Subject: [PATCH] spinlock/x86: move stack declaration before code
 
+[ upstream commit f7f18e92a51276f1e23a0595f59615f79323b358 ]
+
 In function 'rte_try_tm':
 rte_spinlock.h:82:2:
 warning: ISO C90 forbids mixed declarations and code
@@ -10,7 +12,6 @@
   int retries = RTE_RTM_MAX_RETRIES;
 
 Fixes: ba7468997ea6 ("spinlock: add HTM lock elision for x86")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
@@ -19,10 +20,10 @@
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h
-index 4b16887ea..60321da02 100644
+index 5675c2b45..10cd7a30c 100644
 --- a/lib/librte_eal/common/include/arch/x86/rte_spinlock.h
 +++ b/lib/librte_eal/common/include/arch/x86/rte_spinlock.h
-@@ -76,10 +76,12 @@ static inline int rte_tm_supported(void)
+@@ -105,10 +105,12 @@ static inline int rte_tm_supported(void)
  static inline int
  rte_try_tm(volatile int *lock)
  {