dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard 2011-01-11 19:45:31 +00:00 committed by Benjamin Herrenschmidt
parent 7071854bb2
commit a443506b85
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/traps.c
View File

@ -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;