irq fix for 4.3
Subsystems (3)
Linus,
please pull the latest irq-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus
A single fix for the new hierarchical MSI interrupt handling which unbreaks PCI=n configurations.
Thanks,
tglx
------------------>
Marc Zyngier (1):
genirq/msi: Do not use pci_msi_[un]mask_irq as default methods
drivers/pci/msi.c | 4 ++++ kernel/irq/msi.c | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/pci/msi.c +4 -0
@@ -1243,6 +1243,10 @@ static void pci_msi_domain_update_chip_ops(struct msi_domain_info *info)BUG_ON (!chip);if (!chip->irq_write_msi_msg) chip->irq_write_msi_msg = pci_msi_domain_write_msg; +if (!chip->irq_mask) + chip->irq_mask = pci_msi_mask_irq; +if (!chip->irq_unmask) + chip->irq_unmask = pci_msi_unmask_irq; }/**
kernel/irq/msi.c +1 -5
@@ -228,11 +228,7 @@ static void msi_domain_update_chip_ops(struct msi_domain_info *info) {struct irq_chip *chip = info->chip; -BUG_ON (!chip); -if (!chip->irq_mask) - chip->irq_mask = pci_msi_mask_irq; -if (!chip->irq_unmask) - chip->irq_unmask = pci_msi_unmask_irq; +BUG_ON (!chip || !chip->irq_mask || !chip->irq_unmask);if (!chip->irq_set_affinity) chip->irq_set_affinity = msi_domain_set_affinity; }