Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* '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'

Linus Torvalds 15 years ago 78fca1b9 720e87ef

+1 -1

1 changed file

expand all

arch

ia64

kernel

irq.c

+1 -1

arch/ia64/sn/kernel/irq.c

··· 412 412 pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type]; 413 413 414 414 /* Don't force an interrupt if the irq has been disabled */ 415 - if (!irqd_irq_disabled(sn_irq_info->irq_irq) && 415 + if (!irqd_irq_disabled(irq_get_irq_data(sn_irq_info->irq_irq)) && 416 416 pci_provider && pci_provider->force_interrupt) 417 417 (*pci_provider->force_interrupt)(sn_irq_info); 418 418 }