From: Michael Neuling <mikey@neuling.org>
Date: Wed, 2 Oct 2013 07:15:15 +0000 (+1000)
Subject: powerpc/tm: Turn interrupts hard off in tm_reclaim()
X-Git-Tag: v3.11.5~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb1c209733e25177b634f825848c78c998f54e30;p=thirdparty%2Fkernel%2Fstable.git

powerpc/tm: Turn interrupts hard off in tm_reclaim()

commit c69e63b0f135fa51d6e1c38b5ac8a1def15ea3fa upstream.

We can't take IRQs in tm_reclaim as we might have a bogus r13 and r1.

This turns IRQs hard off in this function.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 875282f17f34d..e3f8da3c00b9a 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -128,6 +128,7 @@ _GLOBAL(tm_reclaim)
 	mr	r15, r14
 	ori	r15, r15, MSR_FP
 	li	r16, MSR_RI
+	ori	r16, r16, MSR_EE /* IRQs hard off */
 	andc	r15, r15, r16
 	oris	r15, r15, MSR_VEC@h
 #ifdef CONFIG_VSX