4.4-stable patches

added patches:
	powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch

diff --git a/queue-4.4/powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch b/queue-4.4/powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch
new file mode 100644 (file)
index 0000000..dd7a69b
--- /dev/null
+++ b/queue-4.4/powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch
@@ -0,0 +1,42 @@
+From mpe@ellerman.id.au  Mon Feb 26 09:42:43 2018
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Mon, 26 Feb 2018 13:13:17 +1100
+Subject: powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
+To: stable@vger.kernel.org, greg@kroah.com
+Cc: linuxppc-dev@ozlabs.org, bernhard.kaindl@thalesgroup.com
+Message-ID: <20180226021317.28767-1-mpe@ellerman.id.au>
+
+From: Michael Ellerman <mpe@ellerman.id.au>
+
+The backport of commit aa8a5e0062ac ("powerpc/64s: Add support for RFI
+flush of L1-D cache"), incorrectly placed the new RFI flush code
+inside an existing #ifdef CONFIG_HARDLOCKUP_DETECTOR block.
+
+This has the obvious effect of requiring HARDLOCKUP_DETECTOR to be
+enabled in order for RFI flush to be enabled, which is a bug.
+
+Fix it by moving the #endif up to where it belongs.
+
+Fixes: c3892946315e ("powerpc/64s: Add support for RFI flush of L1-D cache")
+Reported-by: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/kernel/setup_64.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/kernel/setup_64.c
++++ b/arch/powerpc/kernel/setup_64.c
+@@ -835,6 +835,7 @@ static int __init disable_hardlockup_det
+       return 0;
+ }
+ early_initcall(disable_hardlockup_detector);
++#endif
+ 
+ #ifdef CONFIG_PPC_BOOK3S_64
+ static enum l1d_flush_type enabled_flush_types;
+@@ -973,4 +974,3 @@ ssize_t cpu_show_meltdown(struct device
+       return sprintf(buf, "Vulnerable\n");
+ }
+ #endif /* CONFIG_PPC_BOOK3S_64 */
+-#endif

diff --git a/queue-4.4/series b/queue-4.4/series
index f4e4ea61f8331f849e4fc77d7901a6517f971060..219d4ddf7d66075c249ee291b8904f31db01e68f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1 +1,2 @@
 netfilter-drop-outermost-socket-lock-in-getsockopt.patch
+powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch