4.9-stable patches

added patches:
	powerpc-64s-fix-conversion-of-slb_miss_common-to-use-rfi_to_user-kernel.patch

diff --git a/queue-4.9/powerpc-64s-fix-conversion-of-slb_miss_common-to-use-rfi_to_user-kernel.patch b/queue-4.9/powerpc-64s-fix-conversion-of-slb_miss_common-to-use-rfi_to_user-kernel.patch
new file mode 100644 (file)
index 0000000..40694f9
--- /dev/null
+++ b/queue-4.9/powerpc-64s-fix-conversion-of-slb_miss_common-to-use-rfi_to_user-kernel.patch
@@ -0,0 +1,31 @@
+From mpe@ellerman.id.au  Fri Feb 23 12:34:52 2018
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Thu, 22 Feb 2018 23:35:43 +1100
+Subject: powerpc/64s: Fix conversion of slb_miss_common to use RFI_TO_USER/KERNEL
+To: stable@vger.kernel.org, greg@kroah.com
+Cc: npiggin@gmail.com, linuxppc-dev@ozlabs.org, linux@roeck-us.net, corsac@debian.org
+Message-ID: <20180222123545.8946-1-mpe@ellerman.id.au>
+
+From: Michael Ellerman <mpe@ellerman.id.au>
+
+The back port of commit c7305645eb0c ("powerpc/64s: Convert
+slb_miss_common to use RFI_TO_USER/KERNEL") missed a hunk needed to
+restore cr6.
+
+Fixes: 48cc95d4e4d6 ("powerpc/64s: Convert slb_miss_common to use RFI_TO_USER/KERNEL")
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/kernel/exceptions-64s.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/kernel/exceptions-64s.S
++++ b/arch/powerpc/kernel/exceptions-64s.S
+@@ -680,6 +680,7 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_R
+ .machine      push
+ .machine      "power4"
+       mtcrf   0x80,r9
++      mtcrf   0x02,r9         /* I/D indication is in cr6 */
+       mtcrf   0x01,r9         /* slb_allocate uses cr0 and cr7 */
+ .machine      pop
+ 

diff --git a/queue-4.9/series b/queue-4.9/series
index 4e1cb66ba9be15b621cd1f85f65f0a5190cd1461..eb364c726d68308ffc211bd0fee9c44387c5258a 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -84,3 +84,4 @@ x86-mm-kmmio-fix-mmiotrace-for-page-unaligned-addresses.patch
 platform-x86-dell-laptop-fix-keyboard-max-lighting-for-dell-latitude-e6410.patch
 xen-xen_acpi_processor-is-dom0-only.patch
 hippi-fix-a-fix-a-possible-sleep-in-atomic-bug-in-rr_close.patch
+powerpc-64s-fix-conversion-of-slb_miss_common-to-use-rfi_to_user-kernel.patch