projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a53b27b
)
powerpc/tm: Turn interrupts hard off in tm_reclaim()
author
Michael Neuling
<mikey@neuling.org>
Wed, 2 Oct 2013 07:15:15 +0000
(17:15 +1000)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Thu, 3 Oct 2013 07:25:44 +0000
(17:25 +1000)
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>
Cc: <stable@vger.kernel.org> # 3.9+
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/tm.S
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/tm.S
b/arch/powerpc/kernel/tm.S
index 7b60b98514691ee554d1140e408c9802f83d21a4..8ece1908be1af675677b64937f8a53338ae57ae8 100644
(file)
--- 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