diff options
| author | Tony Luck <tony.luck@intel.com> | 2011-04-01 19:56:03 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-04-01 19:56:03 +0200 |
| commit | 4275f4c8f7589bcac55d880529f58dac39815c95 (patch) | |
| tree | ac0ca34bacf1e713a68aa78eb449b907eb776e03 /arch | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-4275f4c8f7589bcac55d880529f58dac39815c95.tar.xz linux-4275f4c8f7589bcac55d880529f58dac39815c95.zip | |
[IA64] fix build warning: argument 1 of 'irqd_irq_disabled'
In commit f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6
ia64: Use irqd_irq_disabled() instead of desc->status access
Thomas forgot to convert from irq to *irq_data.
Add a call to irq_get_irq_data() to fix that.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/sn/kernel/irq.c | 2 |
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); } |