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

Commit a443506b authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: Don't force MSR_RI in machine_check_exception 



We should never force MSR_RI on. If we take a machine check with MSR_RI off
then we have no chance of recovering safely.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 7071854b

arch/powerpc/kernel/traps.c

+1 −4
Original line number Diff line number Diff line
@@ -627,7 +627,6 @@ void machine_check_exception(struct pt_regs *regs) 
		return;



	if (user_mode(regs)) {

		regs->msr |= MSR_RI;

		_exception(SIGBUS, regs, BUS_ADRERR, regs->nip);

		return;

	}
@@ -643,10 +642,8 @@ void machine_check_exception(struct pt_regs *regs) 
	return;

#endif



	if (debugger_fault_handler(regs)) {

		regs->msr |= MSR_RI;

	if (debugger_fault_handler(regs))

		return;

	}



	if (check_io_access(regs))

		return;