diff options
| author | Michael Neuling <mikey@neuling.org> | 2013-10-02 17:15:15 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 18:14:28 -0700 |
| commit | fb1c209733e25177b634f825848c78c998f54e30 (patch) | |
| tree | 7fb0171f17487c3af1658512eb5bd7d026676622 /arch | |
| parent | 39302163d7368f0960f30cf7d785eec2ccae1c26 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/tm.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S index 875282f17f34..e3f8da3c00b9 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 |