From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 May 2021 15:59:20 +0000 (+0200)
Subject: fix up powerpc patch for 4.4 and 4.9
X-Git-Tag: v5.4.120~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca08d45ef70ca8040b5bf8b00a40bfcb2ea10e63;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up powerpc patch for 4.4 and 4.9
---

diff --git a/queue-4.4/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch b/queue-4.4/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch
index c7da9505d4a..312332ac2b4 100644
--- a/queue-4.4/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch
+++ b/queue-4.4/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch
@@ -32,12 +32,20 @@ Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
 Link: https://lore.kernel.org/r/20210506044959.1298123-2-mpe@ellerman.id.au
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/powerpc/lib/feature-fixups.c |   16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
+ arch/powerpc/lib/feature-fixups.c |   17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
 
 --- a/arch/powerpc/lib/feature-fixups.c
 +++ b/arch/powerpc/lib/feature-fixups.c
-@@ -279,8 +279,9 @@ void do_uaccess_flush_fixups(enum l1d_fl
+@@ -16,6 +16,7 @@
+ #include <linux/kernel.h>
+ #include <linux/string.h>
+ #include <linux/init.h>
++#include <linux/stop_machine.h>
+ #include <asm/cputable.h>
+ #include <asm/code-patching.h>
+ #include <asm/page.h>
+@@ -279,8 +280,9 @@ void do_uaccess_flush_fixups(enum l1d_fl
  						: "unknown");
  }
  
@@ -48,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	unsigned int instrs[3], *dest;
  	long *start, *end;
  	int i;
-@@ -331,6 +332,19 @@ void do_entry_flush_fixups(enum l1d_flus
+@@ -331,6 +333,19 @@ void do_entry_flush_fixups(enum l1d_flus
  							: "ori type" :
  		(types &  L1D_FLUSH_MTTRIG)     ? "mttrig type"
  						: "unknown");
diff --git a/queue-4.9/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch b/queue-4.9/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch
index 397f7e09da8..36c7ab2dddf 100644
--- a/queue-4.9/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch
+++ b/queue-4.9/powerpc-64s-fix-crashes-when-toggling-entry-flush-barrier.patch
@@ -32,12 +32,20 @@ Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
 Link: https://lore.kernel.org/r/20210506044959.1298123-2-mpe@ellerman.id.au
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/powerpc/lib/feature-fixups.c |   16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
+ arch/powerpc/lib/feature-fixups.c |   17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
 
 --- a/arch/powerpc/lib/feature-fixups.c
 +++ b/arch/powerpc/lib/feature-fixups.c
-@@ -282,8 +282,9 @@ void do_uaccess_flush_fixups(enum l1d_fl
+@@ -17,6 +17,7 @@
+ #include <linux/kernel.h>
+ #include <linux/string.h>
+ #include <linux/init.h>
++#include <linux/stop_machine.h>
+ #include <asm/cputable.h>
+ #include <asm/code-patching.h>
+ #include <asm/page.h>
+@@ -282,8 +283,9 @@ void do_uaccess_flush_fixups(enum l1d_fl
  						: "unknown");
  }
  
@@ -48,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	unsigned int instrs[3], *dest;
  	long *start, *end;
  	int i;
-@@ -334,6 +335,19 @@ void do_entry_flush_fixups(enum l1d_flus
+@@ -334,6 +336,19 @@ void do_entry_flush_fixups(enum l1d_flus
  							: "ori type" :
  		(types &  L1D_FLUSH_MTTRIG)     ? "mttrig type"
  						: "unknown");