Skip to content

Commit

Permalink
powerpc: Don't force MSR_RI in machine_check_exception
Browse files Browse the repository at this point in the history
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: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Anton Blanchard authored and Benjamin Herrenschmidt committed Jan 21, 2011
1 parent 7071854 commit a443506
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/powerpc/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down

0 comments on commit a443506

Please sign in to comment.