diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 22:00:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 22:00:51 -0800 |
| commit | f4cd87aabb51fcc709b0dacc05b718c400c64172 (patch) | |
| tree | b1710d9da7a42951db8c764f5101b68a45e369af /arch/ia64/kernel/mca.c | |
| parent | 271368b69b9e8042063d6c713423e84503bbdaa0 (diff) | |
| parent | e3a696e03c861f69627185dd235366b9a4403454 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] refresh config files
[IA64] put kdump_find_rsvd_region in __init
[IA64] Remove sparse warning from unwind code
[IA64] add missing syscall trace clear
[IA64] Cleanup in crash.c
[IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
[IA64] pci_get_legacy_ide_irq should return irq (not GSI)
[IA64] whitespace fixes for include/asm-ia64/sal.h
[IA64] Cache error recovery
[IA64] Proper handling of TLB errors from duplicate itr.d dropins
Diffstat (limited to 'arch/ia64/kernel/mca.c')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index a76add3e76a2..491687f84fb5 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -1192,8 +1192,6 @@ void ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, struct ia64_sal_os_state *sos) { - pal_processor_state_info_t *psp = (pal_processor_state_info_t *) - &sos->proc_state_param; int recover, cpu = smp_processor_id(); struct task_struct *previous_current; struct ia64_mca_notify_die nd = @@ -1223,10 +1221,8 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, /* Get the MCA error record and log it */ ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA); - /* TLB error is only exist in this SAL error record */ - recover = (psp->tc && !(psp->cc || psp->bc || psp->rc || psp->uc)) - /* other error recovery */ - || (ia64_mca_ucmc_extension + /* MCA error recovery */ + recover = (ia64_mca_ucmc_extension && ia64_mca_ucmc_extension( IA64_LOG_CURR_BUFFER(SAL_INFO_TYPE_MCA), sos)); |