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

Message ID 1380698115-25841-2-git-send-email-mikey@neuling.org
State Accepted, archived
Headers show

Commit Message

Michael Neuling Oct. 2, 2013, 7:15 a.m.
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>
 arch/powerpc/kernel/tm.S | 1 +
 1 file changed, 1 insertion(+)


diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 7b60b98..8ece190 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -123,6 +123,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