[dpdk-stable] patch 'power: fix cache line alignment' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/20/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin Traynor

---
>From ee000d5f005424bf2988694bded75e0033fba01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom at ericsson.com>
Date: Sun, 5 May 2019 20:12:16 +0200
Subject: [PATCH] power: fix cache line alignment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 7727ad9107137ee3f4dea212ad77e35cd4f3e6bc ]

The ACPI and PState CPU frequency scaling drivers used the
__rte_cache_aligned attribute without including rte_memory.h, which
turns what looks as the declaration of a cache line-aligned struct
into a non-aligned struct declaration and the definition of an
instance of the struct.

Fixes: e6c6dc0f96 ("power: add p-state driver compatibility")
Fixes: 445c6528b5 ("power: common interface for guest and host")

Signed-off-by: Mattias Rönnblom <mattias.ronnblom at ericsson.com>
---
 lib/librte_power/power_acpi_cpufreq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c
index 7addde274..f7d3f9ca9 100644
--- a/lib/librte_power/power_acpi_cpufreq.c
+++ b/lib/librte_power/power_acpi_cpufreq.c
@@ -13,6 +13,7 @@
 #include <limits.h>
 
-#include <rte_memcpy.h>
 #include <rte_atomic.h>
+#include <rte_memcpy.h>
+#include <rte_memory.h>
 
 #include "power_acpi_cpufreq.h"
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.697204142 +0100
+++ 0008-power-fix-cache-line-alignment.patch	2019-05-14 15:39:07.305558971 +0100
@@ -1 +1 @@
-From 7727ad9107137ee3f4dea212ad77e35cd4f3e6bc Mon Sep 17 00:00:00 2001
+From ee000d5f005424bf2988694bded75e0033fba01d Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 7727ad9107137ee3f4dea212ad77e35cd4f3e6bc ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -21,3 +22,2 @@
- lib/librte_power/power_acpi_cpufreq.c   | 5 +++--
- lib/librte_power/power_pstate_cpufreq.c | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
+ lib/librte_power/power_acpi_cpufreq.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -26 +26 @@
-index 5672c594e..7c386f891 100644
+index 7addde274..f7d3f9ca9 100644
@@ -29 +29 @@
-@@ -13,7 +13,8 @@
+@@ -13,6 +13,7 @@
@@ -32 +31,0 @@
--#include <rte_string_fns.h>
@@ -37 +35,0 @@
-+#include <rte_string_fns.h>
@@ -40,15 +37,0 @@
-diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c
-index 44a0b4a3f..ecbcb3ac9 100644
---- a/lib/librte_power/power_pstate_cpufreq.c
-+++ b/lib/librte_power/power_pstate_cpufreq.c
-@@ -15,7 +15,8 @@
- #include <inttypes.h>
- 
--#include <rte_string_fns.h>
--#include <rte_memcpy.h>
- #include <rte_atomic.h>
-+#include <rte_memcpy.h>
-+#include <rte_memory.h>
-+#include <rte_string_fns.h>
- 
- #include "power_pstate_cpufreq.h"