diff options
authorLinus Torvalds <>2019-06-30 11:20:52 +0800
committerLinus Torvalds <>2019-06-30 11:20:52 +0800
commit39132f746eceed6beecb16c7b79600fb54eb8b2b (patch)
parent7c15f41e8743df676f6cb0615e74e8ba30994d6a (diff)
parente13e7cd4c0c1cc9984d9b6a8663e10d76b53f2aa (diff)
Merge tag 'powerpc-5.2-7' of git://
Pull powerpc fix from Michael Ellerman: "One fix for a regression in my commit adding KUAP (Kernel User Access Prevention) on Radix, which incorrectly touched the AMR in the early machine check handler. Thanks to Nicholas Piggin" * tag 'powerpc-5.2-7' of git:// powerpc/64s/exception: Fix machine check early corrupting AMR
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 6b86055e5251..73ba246ca11d 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -315,7 +315,7 @@ TRAMP_REAL_BEGIN(machine_check_common_early)
mfspr r11,SPRN_DSISR /* Save DSISR */
std r11,_DSISR(r1)
std r9,_CCR(r1) /* Save CR in stackframe */
- kuap_save_amr_and_lock r9, r10, cr1
+ /* We don't touch AMR here, we never go to virtual mode */
/* Save r9 through r13 from EXMC save area to stack frame. */
mfmsr r11 /* get MSR value */