From 4a68feb639abfc6d528a625a186777fd80f3491f Mon Sep 17 00:00:00 2001 From: Mike Habeck Date: Mon, 13 Aug 2007 17:13:08 -0500 Subject: [PATCH] --- yaml --- r: 64117 b: refs/heads/master c: 352b0ef50d98049bf022a31eaf2272f52e2f5219 h: refs/heads/master i: 64115: c1eb9812cbaab3b40d1e4d6a2100e538eaa87cee v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/irq.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f3575ec4efc5..a12354d113a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 709ae9309102875f9798349b64849b6743e25193 +refs/heads/master: 352b0ef50d98049bf022a31eaf2272f52e2f5219 diff --git a/trunk/arch/ia64/sn/kernel/irq.c b/trunk/arch/ia64/sn/kernel/irq.c index bfa43e4c7ef7..360047389449 100644 --- a/trunk/arch/ia64/sn/kernel/irq.c +++ b/trunk/arch/ia64/sn/kernel/irq.c @@ -405,7 +405,10 @@ sn_call_force_intr_provider(struct sn_irq_info *sn_irq_info) struct sn_pcibus_provider *pci_provider; pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type]; - if (pci_provider && pci_provider->force_interrupt) + + /* Don't force an interrupt if the irq has been disabled */ + if (!(irq_desc[sn_irq_info->irq_irq].status & IRQ_DISABLED) && + pci_provider && pci_provider->force_interrupt) (*pci_provider->force_interrupt)(sn_irq_info); }