summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-01 13:29:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-01 13:29:22 -0700
commit78fca1b95837a44983608302e89c7258981be9b3 (patch)
treee4601c8f1493459c62915fa88c30b77fff13ac5d
parent720e87efe21b43c89093c1f04ec9ecba2f0213b8 (diff)
parent4275f4c8f7589bcac55d880529f58dac39815c95 (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] fix build warning: argument 1 of 'irqd_irq_disabled'
-rw-r--r--arch/ia64/sn/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 7f399f9d99c7..139c018dbbf9 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -412,7 +412,7 @@ sn_call_force_intr_provider(struct sn_irq_info *sn_irq_info)
pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type];
/* Don't force an interrupt if the irq has been disabled */
- if (!irqd_irq_disabled(sn_irq_info->irq_irq) &&
+ if (!irqd_irq_disabled(irq_get_irq_data(sn_irq_info->irq_irq)) &&
pci_provider && pci_provider->force_interrupt)
(*pci_provider->force_interrupt)(sn_irq_info);
}