Merge tag 'powerpc-5.2-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

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://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/64s/exception: Fix machine check early corrupting AMR

Linus Torvalds committed 7 years ago

Commit 39132f72 parents 7c15f41 e13e7cd1 file · +1 −1Browse files

Unified · Split

arch/powerpc/kernel/exceptions-64s.S+1−1

@@ -315,7 +315,7 @@ TRAMP_REAL_BEGIN(machine_check_common_early) · 314 unmodified lines
315	315	mfspr r11,SPRN_DSISR /* Save DSISR */
316	316	std r11,_DSISR(r1)
317	317	std r9,_CCR(r1) /* Save CR in stackframe */
318		− kuap_save_amr_and_lock r9, r10, cr1
	318	+ /* We don't touch AMR here, we never go to virtual mode */
319	319	/* Save r9 through r13 from EXMC save area to stack frame. */
320	320	EXCEPTION_PROLOG_COMMON_2(PACA_EXMC)
321	321	mfmsr r11 /* get MSR value */