Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78fca1b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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'
parents 720e87ef 4275f4c8

arch/ia64/sn/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}