aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-06 15:37:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-06 15:37:09 -0700
commitedb4a3534adbaf90768d67da35f0bfeac4767db6 (patch)
treee92344973592a5901dc9a0e2f70b78394062639a
parentb954cbcb1a121ad23892a006af5a9616d5265512 (diff)
parent76e677e25dd3d8af77d0b3810eacaacaf2f93f2f (diff)
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
-rw-r--r--arch/ia64/kernel/mca.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 6dc726ad713..d0a5106fba2 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);
/*