Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39132f74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7c15f41e e13e7cd4

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Diff line number Diff line
@@ -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. */

	EXCEPTION_PROLOG_COMMON_2(PACA_EXMC)

	mfmsr	r11			/* get MSR value */