diff options
author | Paul Mackerras | 2005-10-12 06:43:32 +0200 |
---|---|---|
committer | Paul Mackerras | 2005-10-12 06:43:32 +0200 |
commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /arch/ia64/kernel/mca.c | |
parent | powerpc: make iSeries boot again (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.gz kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.xz kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip |
Merge from Linus' tree
Diffstat (limited to 'arch/ia64/kernel/mca.c')
-rw-r--r-- | arch/ia64/kernel/mca.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 6dc726ad7137..d0a5106fba24 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -1016,6 +1016,11 @@ ia64_mca_cmc_int_handler(int cmc_irq, void *arg, struct pt_regs *ptregs) cmc_polling_enabled = 1; spin_unlock(&cmc_history_lock); + /* If we're being hit with CMC interrupts, we won't + * ever execute the schedule_work() below. Need to + * disable CMC interrupts on this processor now. + */ + ia64_mca_cmc_vector_disable(NULL); schedule_work(&cmc_disable_work); /* |