renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull irq fixes from Ingo Molnar:
 "Two genirq fixes, plus an irqchip driver error handling fix"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Respect IRQCHIP_SKIP_SET_WAKE in irq_chip_set_wake_parent()
  genirq: Initialize request_mutex if CONFIG_SPARSE_IRQ=n
  irqchip/irq-ls1x: Missing error code in ls1x_intc_of_init()
This commit is contained in:
Linus Torvalds 2019-04-12 20:21:59 -07:00
commit 6a022984c3
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/irqchip/irq-ls1x.c
View File

@ -130,6 +130,7 @@ static int __init ls1x_intc_of_init(struct device_node *node,
NULL); NULL);
if (!priv->domain) { if (!priv->domain) {
pr_err("ls1x-irq: cannot add IRQ domain\n"); pr_err("ls1x-irq: cannot add IRQ domain\n");
err = -ENOMEM;
goto out_iounmap; goto out_iounmap;
} }

4
kernel/irq/chip.c
View File

@ -1449,6 +1449,10 @@ int irq_chip_set_vcpu_affinity_parent(struct irq_data *data, void *vcpu_info)
int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on) int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on)
{ {
data = data->parent_data; data = data->parent_data;
if (data->chip->flags & IRQCHIP_SKIP_SET_WAKE)
return 0;
if (data->chip->irq_set_wake) if (data->chip->irq_set_wake)
return data->chip->irq_set_wake(data, on); return data->chip->irq_set_wake(data, on);

1
kernel/irq/irqdesc.c
View File

@ -558,6 +558,7 @@ int __init early_irq_init(void)
alloc_masks(&desc[i], node); alloc_masks(&desc[i], node);
raw_spin_lock_init(&desc[i].lock); raw_spin_lock_init(&desc[i].lock);
lockdep_set_class(&desc[i].lock, &irq_desc_lock_class); lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
mutex_init(&desc[i].request_mutex);
desc_set_defaults(i, &desc[i], node, NULL, NULL); desc_set_defaults(i, &desc[i], node, NULL, NULL);
} }
return arch_early_irq_init(); return arch_early_irq_init();