aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/mca_drv.c
diff options
context:
space:
mode:
authorRuss Anderson <rja@sgi.com>2005-04-06 00:07:00 -0700
committerTony Luck <tony.luck@intel.com>2005-05-03 13:47:42 -0700
commitb1b901c2029aa0fd8aa4ac5f04f31648ae2358b4 (patch)
tree43f5dde2309d66fa2112a7c2dc46ea7c63fae459 /arch/ia64/kernel/mca_drv.c
parent[IA64] fix ia64 syscall auditing (diff)
downloadlinux-dev-b1b901c2029aa0fd8aa4ac5f04f31648ae2358b4.tar.xz
linux-dev-b1b901c2029aa0fd8aa4ac5f04f31648ae2358b4.zip
[IA64] MCA recovery improvements
Jack Steiner uncovered some opportunities for improvement in the MCA recovery code. 1) Set bsp to save registers on the kernel stack. 2) Disable interrupts while in the MCA recovery code. 3) Change the way the user process is killed, to avoid a panic in schedule. Testing shows that these changes make the recovery code much more reliable with the 2.6.12 kernel. Signed-off-by: Russ Anderson <rja@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/mca_drv.c')
-rw-r--r--arch/ia64/kernel/mca_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index ab478172c349..abc0113a821d 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -132,8 +132,7 @@ mca_handler_bh(unsigned long paddr)
spin_unlock(&mca_bh_lock);
/* This process is about to be killed itself */
- force_sig(SIGKILL, current);
- schedule();
+ do_exit(SIGKILL);
}
/**
@@ -439,6 +438,7 @@ recover_from_read_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_chec
psr2 = (struct ia64_psr *)&pmsa->pmsa_ipsr;
psr2->cpl = 0;
psr2->ri = 0;
+ psr2->i = 0;
return 1;
}